Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: chromeos/test/data/network/invalid_settings_with_repairs.json

Issue 166903002: Identify and repair ONC files with duplicate GUIDs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Issue_23567011
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/test/data/network/invalid_settings_with_repairs.json
diff --git a/chromeos/test/data/network/invalid_settings_with_repairs.json b/chromeos/test/data/network/invalid_settings_with_repairs.json
index fbe6ada38f8a1f23f41c9749e72f8c609a6ec5f4..f4f9d1fbb6f63db35c9139b75dd3577fd3615e8f 100644
--- a/chromeos/test/data/network/invalid_settings_with_repairs.json
+++ b/chromeos/test/data/network/invalid_settings_with_repairs.json
@@ -1,4 +1,65 @@
{
+ "duplicate-network-guid": {
+ "NetworkConfigurations": [
+ {
+ "GUID": "{485d6076-dd44-6b6d-69787465725f5043}",
pneubeck (no reviews) 2014/02/17 10:11:36 use a short GUID so that it's easier to see that t
kaliamoorthi 2014/02/17 15:06:49 Done.
+ "Type": "WiFi",
+ "Name": "My WiFi Network",
+ "WiFi": {
+ "Passphrase": "chromeos",
+ "SSID": "CrOS_WPA_DlinkN150",
+ "Security": "WPA-PSK"
+ }
+ },
+ {
+ "GUID": "{485d6076-dd44-6b6d-69787465725f5043}",
+ "Type": "WiFi",
+ "Name": "My WiFi Network",
+ "WiFi": {
+ "Passphrase": "chromeos",
+ "SSID": "CrOS_WPA2_trendnet_tew639_gr",
+ "Security": "WPA-PSK"
+ }
+ }
+ ],
+ "Certificates": [],
pneubeck (no reviews) 2014/02/17 10:11:36 can be removed.
kaliamoorthi 2014/02/17 15:06:49 Done.
+ "Type": "UnencryptedConfiguration"
+ },
+ "repaired-duplicate-network-guid": {
+ "NetworkConfigurations": [
+ {
+ "GUID": "{485d6076-dd44-6b6d-69787465725f5043}",
+ "Type": "WiFi",
+ "Name": "My WiFi Network",
+ "WiFi": {
+ "Passphrase": "chromeos",
+ "SSID": "CrOS_WPA_DlinkN150",
+ "Security": "WPA-PSK"
+ }
+ }
+ ],
+ "Certificates": [],
pneubeck (no reviews) 2014/02/17 10:11:36 ditto
kaliamoorthi 2014/02/17 15:06:49 Done.
+ "Type": "UnencryptedConfiguration"
+ },
+ "duplicate-cert-id": {
+ "Type": "UnencryptedConfiguration",
+ "Certificates": [
+ { "GUID": "2",
+ "Type": "Server",
+ "X509": "abc" },
+ { "GUID": "2",
+ "PKCS12": "abc" ,
+ "Type": "Client" }
+ ]
+ },
+ "repaired-duplicate-cert-id": {
+ "Type": "UnencryptedConfiguration",
+ "Certificates": [
+ { "GUID": "2",
+ "Type": "Server",
+ "X509": "abc" }
+ ]
+ },
"managed-network-repaired": {
"Recommended": [],
"GUID": "guid",
@@ -181,7 +242,7 @@
"{58ac1967-a0e7-49e9-be68-123abc}"
],
"EnrollmentURI": [
- "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/generate-cert.html"
+ "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/generate-cert.html"
]
}
}

Powered by Google App Engine
This is Rietveld 408576698