Skip to content

GPII-1839 Using the Dynamic Device Reporter when running acceptance tests #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
klown wants to merge 13 commits into from
Closed

GPII-1839 Using the Dynamic Device Reporter when running acceptance tests #461

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3b4c3a5
GPII-1839: Acceptance tests should use the dynamic device reporter.
klown Jun 17, 2016
3290972
GPII-1839: Linux acceptance tests use the dynamic device reporter.
klown Jun 21, 2016
a61644e
GPII-1839: Windows acceptance tests use the dynamic device reporter.
klown Jun 22, 2016
ee2bc6b
GPII-1839: Use dynamic device reporter when running acceptance tests.
klown Jun 22, 2016
69a4128
Merge master GPII branch into GPII-1839.
klown Sep 22, 2016
21e6ddc
GPII-1839: Merged with latest master.
klown Sep 29, 2016
378a06a
GPII-1839: Gracefully handle writing to non-existent file.
klown Sep 29, 2016
b78dce0
Merge GPII branch 'master' into GPII-1839.
klown Oct 3, 2016
73226b6
GPII-1839: Merge master GPII branch into GPII-1839.
klown Oct 21, 2016
2faad43
GPII-1839: Merge upstream master GPII branch into GPII-1839.
klown Oct 31, 2016
7c7c6be
GPII-1839: Improved test of handling writing non-existent file.
klown Nov 1, 2016
0f32698
GPII-1839: Consolidated basic configuration files.
klown Nov 9, 2016
55ccf12
GPII-1839: Merged upstream master GPII branch
klown Nov 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gpii/configs/gpii.config.cloudBased.development.all.local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"%preferencesServer/configs/gpii.preferencesServer.config.development.json",
"%flatMatchMaker/configs/gpii.flatMatchMaker.config.development.json",
"%rawPreferencesServer/configs/gpii.rawPreferencesServer.config.development.json",
"%deviceReporter/configs/gpii.deviceReporter.config.development.json"
"%deviceReporter/configs/gpii.deviceReporter.config.production.json"
Copy link
Copy Markdown
Member

@kaspermarkus kaspermarkus Sep 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a change that you have made? And if so, what's the reason?

Copy link
Copy Markdown
Member Author

@klown klown Oct 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is a change I made. The reason being that this JIRA is about using the production version of the device reporter for acceptance testing. I'm guessing from your comment that the proposed change is not specific to testing, or has nothing to do with testing at all. Is that correct?

]
}
2 changes: 1 addition & 1 deletion tests/configs/gpii.tests.acceptance.localInstall.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
}
}
},
"mergeConfigs": "%universal/gpii/configs/gpii.config.development.all.local.json"
"mergeConfigs": "%universal/gpii/configs/gpii.config.all.development.dr.production.json"
Copy link
Copy Markdown
Member

@kaspermarkus kaspermarkus Sep 21, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that this file is now identical to "gpii.tests.acceptance.dynamicDeviceReporter.config.json" - so it seems sensible to remove one of them.. perhaps this one and then use the dynamicDeviceReporter instead and update references and docs accordingly

Copy link
Copy Markdown
Member Author

@klown klown Oct 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaspermarkus I need clarification on what "this one" is. Which two config files are identical? Which one are you suggesting should be deleted? I can find no file with the name you gave above:"gpii.tests.acceptance.dynamicDeviceReporter.config.json".

Copy link
Copy Markdown
Member Author

@klown klown Nov 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaspermarkus I figured it out. You meant that "gpii.tests.acceptance.localInstall.dynamicDeviceReporter.config.json" is identical to "gpii.tests.acceptance.localInstall.confg.json". I'll delete the latter and replace it with the former, and update docs etc.

Copy link
Copy Markdown
Member Author

@klown klown Nov 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaspermarkus Done.

}
28 changes: 24 additions & 4 deletions tests/platform/linux/linux-builtIn-testSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ gpii.tests.linux.builtIn.testDefs = fluid.freezeRecursive([
"expectConfigured": "true",
"expectRestored": "false"
}
]
],
deviceReporters: {
"gpii.packageKit.find": {
"expectInstalled": ["gnome-shell"]
}
}
},
{
name: "Testing os_common2 using Flat matchmaker",
Expand All @@ -76,7 +81,12 @@ gpii.tests.linux.builtIn.testDefs = fluid.freezeRecursive([
}]
}
},
processes: []
processes: [],
deviceReporters: {
"gpii.packageKit.find": {
"expectInstalled": ["gsettings-desktop-schemas"]
}
}
},
{
name: "Testing os_gnome using Flat matchmaker",
Expand Down Expand Up @@ -115,7 +125,12 @@ gpii.tests.linux.builtIn.testDefs = fluid.freezeRecursive([
"expectConfigured": "true",
"expectRestored": "false"
}
]
],
deviceReporters: {
"gpii.packageKit.find": {
"expectInstalled": ["gnome-shell"]
}
}
},
{
name: "Testing os_win7 using Flat matchmaker",
Expand Down Expand Up @@ -151,7 +166,12 @@ gpii.tests.linux.builtIn.testDefs = fluid.freezeRecursive([
"expectConfigured": "true",
"expectRestored": "false"
}
]
],
deviceReporters: {
"gpii.packageKit.find": {
"expectInstalled": ["gnome-shell"]
}
}
}
]);

Expand Down
21 changes: 18 additions & 3 deletions tests/platform/linux/linux-orca-testSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ gpii.tests.linux.orca.testDefs = [
"expectConfigured": "true",
"expectRestored": "false"
}
]
],
deviceReporters: {
"gpii.packageKit.find": {
"expectInstalled": ["orca"]
}
}
},
{
name: "Testing screenreader_orca using Flat matchmaker",
Expand Down Expand Up @@ -94,7 +99,12 @@ gpii.tests.linux.orca.testDefs = [
"expectConfigured": "true",
"expectRestored": "false"
}
]
],
deviceReporters: {
"gpii.packageKit.find": {
"expectInstalled": ["orca"]
}
}
},
{
name: "Testing screenreader_nvda using Flat matchmaker",
Expand Down Expand Up @@ -129,7 +139,12 @@ gpii.tests.linux.orca.testDefs = [
"expectConfigured": "true",
"expectRestored": "false"
}
]
],
deviceReporters: {
"gpii.packageKit.find": {
"expectInstalled": ["orca"]
}
}
}
];

Expand Down
15 changes: 12 additions & 3 deletions tests/platform/windows/windows-builtIn-testSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ gpii.tests.windows.builtIn = [
"expectConfigured": "1",
"expectRestored": "0"
}
]
],
deviceReporters: {
"gpii.deviceReporter.alwaysInstalled" : { }
}
}, {
name: "Testing os_common using Flat matchmaker",
userToken: "os_common",
Expand Down Expand Up @@ -242,7 +245,10 @@ gpii.tests.windows.builtIn = [
"expectConfigured": "1",
"expectRestored": "0"
}
]
],
deviceReporters: {
"gpii.deviceReporter.alwaysInstalled" : { }
}
}, {
name: "Testing os_gnome using Flat matchmaker",
userToken: "os_gnome",
Expand Down Expand Up @@ -309,7 +315,10 @@ gpii.tests.windows.builtIn = [
"expectConfigured": "1",
"expectRestored": "0"
}
]
],
deviceReporters: {
"gpii.deviceReporter.alwaysInstalled" : { }
}
}
];

Expand Down
22 changes: 20 additions & 2 deletions tests/platform/windows/windows-jaws-testSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,16 @@ gpii.tests.windows.jaws = [
"expectConfigured": "1",
"expectRestored": "0"
}
]
],
deviceReporters: {
"gpii.deviceReporter.registryKeyExists": {
"expectInstalled": [{
"hKey": "HKEY_LOCAL_MACHINE",
"path": "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\JAWS15.exe",
"subPath": ""
}]
}
}
}, {
name: "Testing NP set \"jaws_common\" using Flat matchmaker",
userToken: "jaws_common",
Expand All @@ -71,7 +80,16 @@ gpii.tests.windows.jaws = [
"expectConfigured": "1",
"expectRestored": "0"
}
]
],
deviceReporters: {
"gpii.deviceReporter.registryKeyExists": {
"expectInstalled": [{
"hKey": "HKEY_LOCAL_MACHINE",
"path": "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\JAWS15.exe",
"subPath": ""
}]
}
}
}
];

Expand Down
10 changes: 8 additions & 2 deletions tests/platform/windows/windows-maavis-testSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ gpii.tests.windows.maavis = [
"expectConfigured": "1",
"expectRestored": "0"
}
]
],
deviceReporters: {
"gpii.deviceReporter.alwaysInstalled" : { }
}
}, {
name: "Testing maavis_selfvoicing using Flat matchmaker",
userToken: "maavis_selfvoicing",
Expand All @@ -75,7 +78,10 @@ gpii.tests.windows.maavis = [
"expectConfigured": "1",
"expectRestored": "0"
}
]
],
deviceReporters: {
"gpii.deviceReporter.alwaysInstalled" : { }
}
}
];

Expand Down
33 changes: 30 additions & 3 deletions tests/platform/windows/windows-nvda-testSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,16 @@ gpii.tests.windows.nvda = [
"expectConfigured": "1",
"expectRestored": "0"
}
]
],
deviceReporters: {
"gpii.deviceReporter.registryKeyExists": {
"expectInstalled": [{
"hKey": "HKEY_LOCAL_MACHINE",
"path": "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\nvda.exe",
"subPath": ""
}]
}
}
}, {
name: "Testing screenreader_common using Flat matchmaker",
userToken: "screenreader_common",
Expand Down Expand Up @@ -99,7 +108,16 @@ gpii.tests.windows.nvda = [
"expectConfigured": "1",
"expectRestored": "0"
}
]
],
deviceReporters: {
"gpii.deviceReporter.registryKeyExists": {
"expectInstalled": [{
"hKey": "HKEY_LOCAL_MACHINE",
"path": "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\nvda.exe",
"subPath": ""
}]
}
}
}, {
name: "Testing screenreader_orca using Flat matchmaker",
userToken: "screenreader_orca",
Expand Down Expand Up @@ -131,7 +149,16 @@ gpii.tests.windows.nvda = [
"expectConfigured": "1",
"expectRestored": "0"
}
]
],
deviceReporters: {
"gpii.deviceReporter.registryKeyExists": {
"expectInstalled": [{
"hKey": "HKEY_LOCAL_MACHINE",
"path": "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\nvda.exe",
"subPath": ""
}]
}
}
}
];

Expand Down