Mock Scanner, instead of scan the computer running the test. by GabrielBrascher · Pull Request #3173 · apache/cloudstack

GabrielBrascher · 2019-02-11T13:53:09Z

This allows computers with Windows or MacOS to run the tests without scanning for /proc/meminfo path.

At the class MemStat.java, the refresh() method (called in MemStat constructor) has the following lines:

public void refresh() {
        File f = new File(MEMINFO_FILE);
        try (Scanner scanner = new Scanner(f,"UTF-8")) {
            parseFromScanner(scanner);
        } catch (FileNotFoundException ex) {
            throw new RuntimeException("File " + MEMINFO_FILE + " not found:" + ex.toString());
        }
}

When executing Scanner scanner = new Scanner(f,"UTF-8") it scans the file MEMINFO_FILE (/proc/meminfo); however, if the OS running this test is not a Linux then it throws FileNotFoundException, failing the test.

Thus, by Mocking the Scanner constructor, the new Scanner(f,"UTF-8") execution returns the desired Scanner.

Description

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

How Has This Been Tested?

GabrielBrascher · 2019-02-11T17:35:45Z

Ping for review @kiwiflyer @nathanejohnson @DaanHoogland and others.

nathanejohnson · 2019-02-11T17:50:08Z

Still getting failures on mac:

  <testcase name="getMemInfoParseTest" classname="org.apache.cloudstack.utils.linux.MemStatTest" time="0.058">
    <error message="File /proc/meminfo not found:java.io.FileNotFoundException: /proc/meminfo (No such file or directory)" type="java.lang.RuntimeException">java.lang.RuntimeException: File /proc/meminfo not found:java.io.FileNotFoundException: /proc/meminfo (No such file or directory)
        at org.apache.cloudstack.utils.linux.MemStatTest.getMemInfoParseTest(MemStatTest.java:43)
</error>
  </testcase>

mac_mem_test_fail.tar.gz

(njohnson@greyeagle:~/src/cloudstack)$ git branch
  master
* test-running-only-on-linux
(njohnson@greyeagle:~/src/cloudstack)$ git remote -v
origin	https://github.com/PCextreme/cloudstack.git (fetch)
origin	https://github.com/PCextreme/cloudstack.git (push)
(njohnson@greyeagle:~/src/cloudstack)$

This allows non linux machines to run the tests without scanning for a non existing /proc/meminfo.

GabrielBrascher · 2019-02-11T18:01:08Z

Updated the code with a setup method and removed a variable that I left without mocking. Thanks for testing @nathanejohnson. Could you please test it again to make sure that it has been fixed?

nathanejohnson · 2019-02-11T18:28:53Z

still getting failures, but in a new place. I've attached logs

mac_test_fail.tar.gz

GabrielBrascher · 2019-02-12T12:20:23Z

@blueorangutan package

blueorangutan · 2019-02-12T12:21:10Z

@GabrielBrascher a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2019-02-12T12:59:29Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2609

GabrielBrascher · 2019-02-12T13:00:06Z

@blueorangutan test

blueorangutan · 2019-02-12T13:01:10Z

@GabrielBrascher a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

GabrielBrascher · 2019-02-12T13:11:38Z

still getting failures, but in a new place. I've attached logs

@nathanejohnson that is good. At least this PR fixed the test failures from MemStatTest.java.
It looks like we have more tests to take a look into as well. Thanks for pointing that!

wido

LGTM based on code

DaanHoogland · 2019-02-12T18:43:59Z

MemStatTest passes @GabrielBrascher . The following remains:

[INFO]
[INFO] Results:
[INFO]
[ERROR] Errors:
[ERROR]   LibvirtComputingResourceTest.diskUuidToSerialTest:437 » Runtime File /proc/mem...
[ERROR]   LibvirtComputingResourceTest.testAddExtraConfigComponentEmptyExtraConfig:5235 » Runtime
[ERROR]   LibvirtComputingResourceTest.testAddExtraConfigComponentNotEmptyExtraConfig:5242 » Runtime
[ERROR]   LibvirtComputingResourceTest.testCreateVMFromSpec:324 » Runtime File /proc/mem...
[ERROR]   LibvirtComputingResourceTest.testCreateVMFromSpecLegacy:224 » Runtime File /pr...
[ERROR]   LibvirtComputingResourceTest.testCreateVMFromSpecWithTopology4:288 » Runtime F...
[ERROR]   LibvirtComputingResourceTest.testCreateVMFromSpecWithTopology6:256 » Runtime F...
[ERROR]   LibvirtComputingResourceTest.testGetVmStat:509 » Runtime File /proc/meminfo no...
[ERROR]   LibvirtComputingResourceTest.testIsInterface:5118 » Runtime File /proc/meminfo...
[ERROR]   LibvirtComputingResourceTest.testKnownCommand:5222 » Runtime File /proc/meminf...
[ERROR]   LibvirtComputingResourceTest.testMemoryFreeInKBsDomainReturningNoMemoryStatistics:5149 » Runtime
[ERROR]   LibvirtComputingResourceTest.testMemoryFreeInKBsDomainReturningOfSomeMemoryStatistics:5138 » Runtime
[ERROR]   LibvirtComputingResourceTest.testSetQuotaAndPeriod:5178 » Runtime File /proc/m...
[ERROR]   LibvirtComputingResourceTest.testSetQuotaAndPeriodMinQuota:5202 » Runtime File...
[ERROR]   LibvirtComputingResourceTest.testSetQuotaAndPeriodNoCpuLimitUse:5190 » Runtime
[ERROR]   LibvirtComputingResourceTest.testUUID:444 » Runtime File /proc/meminfo not fou...
[ERROR]   LibvirtComputingResourceTest.testUnknownCommand:5210 » Runtime File /proc/memi...
[ERROR]   LibvirtVifDriverTest.setUp:54 » Runtime File /proc/meminfo not found:java.io.F...
[ERROR]   LibvirtVifDriverTest.setUp:54 » Runtime File /proc/meminfo not found:java.io.F...
[ERROR]   LibvirtVifDriverTest.setUp:54 » Runtime File /proc/meminfo not found:java.io.F...
[ERROR]   LibvirtVifDriverTest.setUp:54 » Runtime File /proc/meminfo not found:java.io.F...
[ERROR]   LibvirtVifDriverTest.setUp:54 » Runtime File /proc/meminfo not found:java.io.F...
[ERROR]   LibvirtVifDriverTest.setUp:54 » Runtime File /proc/meminfo not found:java.io.F...
[ERROR]   LibvirtVifDriverTest.setUp:54 » Runtime File /proc/meminfo not found:java.io.F...
[ERROR]   LibvirtMigrateCommandWrapperTest.deleteOrDisconnectDisksOnSourcePoolTest:410 » Runtime
[ERROR]   LibvirtMigrateCommandWrapperTest.testMigrationUri:333 » Runtime File /proc/mem...
[ERROR]   LibvirtMigrateCommandWrapperTest.testMigrationUriException »  Unexpected excep...
[ERROR]   LibvirtNetworkElementCommandWrapperTest.setUp:217 » Runtime File /proc/meminfo...
[ERROR]   LibvirtNetworkElementCommandWrapperTest.setUp:217 » Runtime File /proc/meminfo...
[ERROR]   LibvirtReplugNicCommandWrapperTest.setUp:189 » Runtime File /proc/meminfo not ...
[INFO]
[ERROR] Tests run: 214, Failures: 0, Errors: 30, Skipped: 2

blueorangutan · 2019-02-12T22:56:50Z

Trillian test result (tid-3404)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34170 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3173-t3404-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_accounts.py
Intermittent failure detected: /marvin/tests/smoke/test_iso.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 66 look OK, 4 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestTemplateHierarchy>:setup	`Error`	1516.38	test_accounts.py
test_04_extract_Iso	`Failure`	1.05	test_iso.py
test_04_extract_template	`Failure`	1.06	test_templates.py
test_06_download_detached_volume	`Failure`	9.27	test_volumes.py

borisstoyanov

LGTM

dhlaluku

LGTM

yadvr · 2019-03-26T07:34:52Z

Is this good to merge @GabrielBrascher @wido ?

DaanHoogland · 2019-03-26T11:52:07Z

@rhtyd I submitted some additions to @GabrielBrascher . I hope these can be included in this PR: CLDIN#3

* powermock costructor for libvirt wrappers * run test only on linux, don't assume we're on linux * import

GabrielBrascher · 2019-03-29T11:46:07Z

@rhtyd @DaanHoogland I updated the branch with the changes proposed by Daan.

DaanHoogland · 2019-04-03T11:36:38Z

@nathanejohnson can you give this a test, please? #worksforme

DaanHoogland · 2019-04-03T11:37:43Z

travis test run 7 always seems to fail, lately :(

GabrielBrascher · 2019-04-23T20:41:19Z

@DaanHoogland yes, test 7 has been failing constantly, not only in this PR. #3267 looks like a fix for the Travis-CI timeout.

GabrielBrascher · 2019-04-23T20:41:42Z

@nathanejohnson are you ok with this PR?

nathanejohnson · 2019-04-23T20:54:42Z

@GabrielBrascher sorry for the late response, builds on my machine now! LGTM!

…3173) * Mock Scanner, instead of scan the computer running the test. This allows non linux machines to run the tests without scanning for a non existing /proc/meminfo. * test fixes on 'other' platforms libvirt wrapper unit tests (apache#3)

GabrielBrascher added type:bug Severity:BLOCKER labels Feb 11, 2019

GabrielBrascher added this to the 4.12.0.0 milestone Feb 11, 2019

GabrielBrascher self-assigned this Feb 11, 2019

GabrielBrascher removed the Severity:BLOCKER label Feb 11, 2019

GabrielBrascher removed this from the 4.12.0.0 milestone Feb 11, 2019

Mock Scanner, instead of scan the computer running the test.

b83a172

This allows non linux machines to run the tests without scanning for a non existing /proc/meminfo.

GabrielBrascher force-pushed the test-running-only-on-linux branch from b4dcd9a to b83a172 Compare February 11, 2019 17:57

yadvr approved these changes Feb 12, 2019

View reviewed changes

wido self-requested a review February 12, 2019 14:56

wido approved these changes Feb 12, 2019

View reviewed changes

GabrielBrascher mentioned this pull request Feb 13, 2019

Keep iotune section in the VM's XML after live migration #3171

Merged

5 tasks

borisstoyanov approved these changes Feb 20, 2019

View reviewed changes

dhlaluku approved these changes Feb 20, 2019

View reviewed changes

DaanHoogland mentioned this pull request Mar 8, 2019

test fixes on 'other' platforms libvirt wrapper unit tests CLDIN/cloudstack#3

Merged

yadvr added this to the 4.13.0.0 milestone Mar 26, 2019

DaanHoogland and others added 2 commits March 28, 2019 11:46

test fixes on 'other' platforms libvirt wrapper unit tests (#3)

ba8157a

* powermock costructor for libvirt wrappers * run test only on linux, don't assume we're on linux * import

Merge branch 'master' into test-running-only-on-linux

4852653

nathanejohnson self-requested a review April 23, 2019 20:54

nathanejohnson approved these changes Apr 23, 2019

View reviewed changes

DaanHoogland merged commit 8f7b27b into apache:master Apr 24, 2019

Conversation

GabrielBrascher commented Feb 11, 2019

Description

Types of changes

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

GabrielBrascher commented Feb 11, 2019

Uh oh!

nathanejohnson commented Feb 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GabrielBrascher commented Feb 11, 2019

Uh oh!

nathanejohnson commented Feb 11, 2019

Uh oh!

GabrielBrascher commented Feb 12, 2019

Uh oh!

blueorangutan commented Feb 12, 2019

Uh oh!

blueorangutan commented Feb 12, 2019

Uh oh!

GabrielBrascher commented Feb 12, 2019

Uh oh!

blueorangutan commented Feb 12, 2019

Uh oh!

GabrielBrascher commented Feb 12, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wido left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Feb 12, 2019

Uh oh!

blueorangutan commented Feb 12, 2019

Uh oh!

borisstoyanov left a comment

Choose a reason for hiding this comment

Uh oh!

dhlaluku left a comment

Choose a reason for hiding this comment

Uh oh!

yadvr commented Mar 26, 2019

Uh oh!

DaanHoogland commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GabrielBrascher commented Mar 29, 2019

Uh oh!

DaanHoogland commented Apr 3, 2019

Uh oh!

DaanHoogland commented Apr 3, 2019

Uh oh!

GabrielBrascher commented Apr 23, 2019

Uh oh!

GabrielBrascher commented Apr 23, 2019

Uh oh!

nathanejohnson commented Apr 23, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

nathanejohnson commented Feb 11, 2019 •

edited

Loading

GabrielBrascher commented Feb 12, 2019 •

edited

Loading

DaanHoogland commented Mar 26, 2019 •

edited

Loading