test: whoops, update snapshots with NormalizedExpectationPropertyValue

erichdongubler-mozilla · Oct 27, 2023 · b589813 · b589813
1 parent 3cf0eeb
commit b589813
Showing 1 changed file with 78 additions and 57 deletions.
diff --git a/src/bin/moz-webgpu-cts/metadata.rs b/src/bin/moz-webgpu-cts/metadata.rs
@@ -747,9 +747,13 @@ r#"
                                 properties: AnalyzeableProps {
                                     is_disabled: false,
                                     expectations: Some(
-                                        Unconditional(
-                                            Permanent(
-                                                Pass,
+                                        NormalizedExpectationPropertyValue(
+                                            Collapsed(
+                                                Collapsed(
+                                                    Permanent(
+                                                        Pass,
+                                                    ),
+                                                ),
                                             ),
                                         ),
                                     ),
@@ -813,12 +817,16 @@ r#"
                         properties: AnalyzeableProps {
                             is_disabled: false,
                             expectations: Some(
-                                Unconditional(
-                                    Intermittent(
-                                        {
-                                            Pass,
-                                            Fail,
-                                        },
+                                NormalizedExpectationPropertyValue(
+                                    Collapsed(
+                                        Collapsed(
+                                            Intermittent(
+                                                [
+                                                    Pass,
+                                                    Fail,
+                                                ],
+                                            ),
+                                        ),
                                     ),
                                 ),
                             ),
@@ -850,9 +858,13 @@ r#"
                 properties: AnalyzeableProps {
                     is_disabled: false,
                     expectations: Some(
-                        Unconditional(
-                            Permanent(
-                                Ok,
+                        NormalizedExpectationPropertyValue(
+                            Collapsed(
+                                Collapsed(
+                                    Permanent(
+                                        Ok,
+                                    ),
+                                ),
                             ),
                         ),
                     ),
@@ -862,9 +874,13 @@ r#"
                         properties: AnalyzeableProps {
                             is_disabled: false,
                             expectations: Some(
-                                Unconditional(
-                                    Permanent(
-                                        Pass,
+                                NormalizedExpectationPropertyValue(
+                                    Collapsed(
+                                        Collapsed(
+                                            Permanent(
+                                                Pass,
+                                            ),
+                                        ),
                                     ),
                                 ),
                             ),
@@ -902,23 +918,26 @@ r#"
                         properties: AnalyzeableProps {
                             is_disabled: false,
                             expectations: Some(
-                                Conditional(
-                                    ConditionalValue {
-                                        conditions: [
-                                            (
-                                                Applicability {
-                                                    platform: Some(
-                                                        Linux,
-                                                    ),
-                                                    build_profile: None,
-                                                },
+                                NormalizedExpectationPropertyValue(
+                                    Expanded(
+                                        {
+                                            Windows: Collapsed(
+                                                Permanent(
+                                                    Pass,
+                                                ),
+                                            ),
+                                            Linux: Collapsed(
                                                 Permanent(
                                                     Fail,
                                                 ),
                                             ),
-                                        ],
-                                        fallback: None,
-                                    },
+                                            MacOs: Collapsed(
+                                                Permanent(
+                                                    Pass,
+                                                ),
+                                            ),
+                                        },
+                                    ),
                                 ),
                             ),
                         },
@@ -956,27 +975,26 @@ r#"
                         properties: AnalyzeableProps {
                             is_disabled: false,
                             expectations: Some(
-                                Conditional(
-                                    ConditionalValue {
-                                        conditions: [
-                                            (
-                                                Applicability {
-                                                    platform: Some(
-                                                        Linux,
-                                                    ),
-                                                    build_profile: None,
-                                                },
+                                NormalizedExpectationPropertyValue(
+                                    Expanded(
+                                        {
+                                            Windows: Collapsed(
+                                                Permanent(
+                                                    Timeout,
+                                                ),
+                                            ),
+                                            Linux: Collapsed(
                                                 Permanent(
                                                     Fail,
                                                 ),
                                             ),
-                                        ],
-                                        fallback: Some(
-                                            Permanent(
-                                                Timeout,
+                                            MacOs: Collapsed(
+                                                Permanent(
+                                                    Timeout,
+                                                ),
                                             ),
-                                        ),
-                                    },
+                                        },
+                                    ),
                                 ),
                             ),
                         },
@@ -1012,23 +1030,26 @@ r#"
                         properties: AnalyzeableProps {
                             is_disabled: false,
                             expectations: Some(
-                                Conditional(
-                                    ConditionalValue {
-                                        conditions: [
-                                            (
-                                                Applicability {
-                                                    platform: Some(
-                                                        MacOs,
-                                                    ),
-                                                    build_profile: None,
-                                                },
+                                NormalizedExpectationPropertyValue(
+                                    Expanded(
+                                        {
+                                            Windows: Collapsed(
+                                                Permanent(
+                                                    Pass,
+                                                ),
+                                            ),
+                                            Linux: Collapsed(
+                                                Permanent(
+                                                    Pass,
+                                                ),
+                                            ),
+                                            MacOs: Collapsed(
                                                 Permanent(
                                                     Fail,
                                                 ),
                                             ),
-                                        ],
-                                        fallback: None,
-                                    },
+                                        },
+                                    ),
                                 ),
                             ),
                         },