Arch linux does not have osrelease or osmajorrelease grains (#34453)

saltstack · Jul 5, 2016 · 0460edb · 0460edb
1 parent fc67a4e
commit 0460edb
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tests/integration/modules/grains.py b/tests/integration/modules/grains.py
@@ -111,9 +111,14 @@ def test_get_core_grains(self):
         test to ensure some core grains are returned
         '''
         grains = ['os', 'os_family', 'osmajorrelease', 'osrelease', 'osfullname', 'id']
+        os = self.run_function('grains.get', ['os'])
+
         for grain in grains:
             get_grain = self.run_function('grains.get', [grain])
-            self.assertTrue(get_grain, grain + "is not available")
+            if os == 'Arch' and grain in ['osmajorrelease', 'osrelease']:
+                self.assertEqual(get_grain, '')
+                continue
+            self.assertTrue(get_grain)
 
 
 class GrainsAppendTestCase(integration.ModuleCase):