7114115 test_missing_iso is run on SPARC (and fails) S11U1Build5
authorMary Ding <mary.ding@oracle.com>
Tue, 06 Dec 2011 10:14:48 -0800
changeset 1556 391f2a9a4b4c
parent 1555 03b47172ab6d
child 1557 db27dcc38c10
7114115 test_missing_iso is run on SPARC (and fails)
usr/src/cmd/distro_const/checkpoints/test/test_create_usb.py
--- a/usr/src/cmd/distro_const/checkpoints/test/test_create_usb.py	Mon Dec 05 15:27:45 2011 -0800
+++ b/usr/src/cmd/distro_const/checkpoints/test/test_create_usb.py	Tue Dec 06 10:14:48 2011 -0800
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 """ test_create_usb
@@ -29,8 +29,10 @@
  Test program for create_usb
 """
 
+import platform
 import unittest
 
+from nose.plugins.skip import SkipTest
 from subprocess import CalledProcessError
 
 from solaris_install.distro_const.checkpoints.create_usb import CreateUSB
@@ -49,7 +51,10 @@
         engine_test_utils.reset_engine()
 
     def test_missing_iso(self):
-        self.c_usb.dist_usb = "/var/tmp/temp.usb"
-        self.c_usb.dist_iso = "/var/tmp/temp.iso"
-        self.c_usb.tmp_mnt = "/var/tmp/tmp_mnt"
-        self.assertRaises(CalledProcessError, self.c_usb.run_usbgen)
+	if platform.processor() == "i386":
+            self.c_usb.dist_usb = "/var/tmp/temp.usb"
+            self.c_usb.dist_iso = "/var/tmp/temp.iso"
+            self.c_usb.tmp_mnt = "/var/tmp/tmp_mnt"
+            self.assertRaises(CalledProcessError, self.c_usb.run_usbgen)
+        else:
+            raise SkipTest("Not on i386")