commit a478df407d5abe303637986f5f3bbc11062f6c97
author A R Karthick <kramanar@ciena.com> Wed Jul 27 16:51:08 2016 -0700
committer A R Karthick <kramanar@ciena.com> Wed Jul 27 16:51:08 2016 -0700
tree 69d9cd932d994312230a4941ee848aebf523c50e
parent 14118c673961f3f92b01fcb82f23c4847546ddd3

Test: Don't run the subscriber onos restart tests if they can't restart ONOS.

Change-Id: I8067de6e5fd33cdefdb70dd8bf8962b28be06821

src/test/cordSubscriber/cordSubscriberTest.py

diff --git a/src/test/cordSubscriber/cordSubscriberTest.py b/src/test/cordSubscriber/cordSubscriberTest.py
index 7f002df..7a52092 100644
--- a/src/test/cordSubscriber/cordSubscriberTest.py
+++ b/src/test/cordSubscriber/cordSubscriberTest.py
@@ -183,6 +183,7 @@
       num_subscribers = 0
       num_channels = 0
       recv_timeout = False
+      onos_restartable = not bool(int(os.getenv('ONOS_RESTART_DISABLED', 0)))
 
       @classmethod
       def load_device_id(cls):
@@ -257,8 +258,7 @@
 
       @classmethod
       def start_onos(cls, network_cfg = None):
-            v = bool(int(os.getenv('ONOS_RESTART_DISABLED', 0)))
-            if v:
+            if cls.onos_restartable is False:
                   log.info('ONOS restart is disabled. Skipping ONOS restart')
                   return
             if network_cfg is None:
@@ -515,14 +515,17 @@
           """Test subscriber join and receive for channel surfing"""
           self.num_subscribers = 5
           self.num_channels = 1
-          test_status = self.subscriber_join_verify(num_subscribers = self.num_subscribers,
-                                                    num_channels = self.num_channels,
-                                                    port_list = self.generate_port_list(self.num_subscribers,
-                                                                                        self.num_channels))
+          test_status = True
+          ##Run this test only if ONOS can be restarted as it incurs a network-cfg change
+          if self.onos_restartable is True:
+                test_status = self.subscriber_join_verify(num_subscribers = self.num_subscribers,
+                                                          num_channels = self.num_channels,
+                                                          port_list = self.generate_port_list(self.num_subscribers,
+                                                                                              self.num_channels))
           assert_equal(test_status, True)
 
       def test_subscriber_join_jump(self):
-          """Test subscriber join and receive for channel surfing"""
+          """Test subscriber join jump for channel surfing"""
           self.num_subscribers = 5
           self.num_channels = 10
           test_status = self.subscriber_join_verify(num_subscribers = self.num_subscribers,