Removed Travis skips

circus-tent · Sep 16, 2013 · 5ca0c3a · 5ca0c3a
1 parent b45533a
commit 5ca0c3a
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 32 deletions.
diff --git a/circus/tests/test_arbiter.py b/circus/tests/test_arbiter.py
@@ -72,8 +72,6 @@ def test_processes(self):
         self.assertEqual(len(resp.get('pids')), 4)
 
     def test_watchers(self):
-        if 'TRAVIS' in os.environ:
-            return
         resp = self.cli.call(make_message("list"))
         self.assertEqual(resp.get('watchers'), ["test"])
 
@@ -235,28 +233,16 @@ def test_reload2(self):
         self.assertNotEqual(processes1[0], processes2[0])
 
     def test_stop_watchers(self):
-        if 'TRAVIS' in os.environ:
-            return
-        resp = self.cli.call(make_message("stop"))
-        self.assertEqual(resp.get("status"), "ok")
-
-    def test_stop_watchers1(self):
-        if 'TRAVIS' in os.environ:
-            return
         self.cli.call(make_message("stop", async=False))
         resp = self.cli.call(make_message("status", name="test"))
         self.assertEqual(resp.get("status"), "stopped")
 
     def test_stop_watchers2(self):
-        if 'TRAVIS' in os.environ:
-            return
         self.cli.call(make_message("stop", name="test", async=False))
         resp = self.cli.call(make_message("status", name="test"))
         self.assertEqual(resp.get('status'), "stopped")
 
     def test_stop_watchers3(self):
-        if 'TRAVIS' in os.environ:
-            return
         cmd, args = self._get_cmd_args()
         msg = make_message("add", name="test1", cmd=cmd, args=args,
                            options=self._get_options())
@@ -323,8 +309,6 @@ def test_udp_discovery(self):
         """test_udp_discovery: Test that when the circusd answer UDP call.
 
         """
-        if 'TRAVIS' in os.environ:
-            return
         self._stop_runners()
 
         dummy_process = 'circus.tests.support.run_process'

diff --git a/circus/tests/test_plugin_resource_watcher.py b/circus/tests/test_plugin_resource_watcher.py
@@ -1,8 +1,6 @@
 import os
 import warnings
 
-from unittest2 import skipIf
-
 from circus.tests.support import TestCircus, poll_for, Process, run_plugin
 from circus.plugins.resource_watcher import ResourceWatcher
 
@@ -147,7 +145,6 @@ def test_resource_watcher_max_cpu(self):
             _statsd = run_plugin(ResourceWatcher, config)
             assert len(w) == numws - 1
 
-    @skipIf('TRAVIS' in os.environ, 'Travis')
     def test_resource_watcher_min_cpu(self):
         config = {'loop_rate': 0.1, 'min_cpu': 99.0}
 

diff --git a/circus/tests/test_sockets.py b/circus/tests/test_sockets.py
@@ -9,9 +9,6 @@
 from circus.sockets import CircusSocket, CircusSockets
 
 
-TRAVIS = os.getenv('TRAVIS', False)
-
-
 class TestSockets(unittest.TestCase):
 
     def test_socket(self):

diff --git a/circus/tests/test_stats_client.py b/circus/tests/test_stats_client.py
@@ -42,9 +42,6 @@ def tearDown(self):
                 os.remove(file)
 
     def test_handler(self):
-        if os.getenv('TRAVIS', False):
-            return
-
         log = self._get_file()
         stream = {'stream': FileStream(log)}
         self._run_circus('circus.tests.test_stats_client.run_process',

diff --git a/circus/tests/test_stats_collector.py b/circus/tests/test_stats_collector.py
@@ -1,4 +1,3 @@
-import os
 import socket
 import time
 from collections import defaultdict
@@ -165,7 +164,6 @@ def test_collector_aggregation_when_unknown_values(self):
         self.assertEquals(len(res['pid']), 10)
         self.assertEquals(res['cpu'], 'N/A')
 
-    @unittest.skipIf('TRAVIS' in os.environ, 'Travis')
     def test_socketstats(self):
         collector = self._get_collector(SocketStatsCollector)
         collector.start()

diff --git a/circus/tests/test_stats_streamer.py b/circus/tests/test_stats_streamer.py
@@ -7,7 +7,7 @@
 from zmq.eventloop import ioloop
 
 from circus.stats.collector import SocketStatsCollector
-from circus.tests.support import TestCircus, unittest
+from circus.tests.support import TestCircus
 from circus.stats.streamer import StatsStreamer
 from circus import util
 from circus import client
@@ -58,7 +58,6 @@ def _call(self, cmd):
 
         raise NotImplementedError(cmd)
 
-    @unittest.skipIf('TRAVIS' in os.environ, 'Travis')
     def test_socketstats(self):
 
         endpoint = util.DEFAULT_ENDPOINT_DEALER

diff --git a/circus/tests/test_watcher.py b/circus/tests/test_watcher.py
@@ -184,9 +184,6 @@ def _ready(olds, news):
         self.assertNotEqual(initial_pids, current_pids)
 
     def test_arbiter_reference(self):
-        if 'TRAVIS' in os.environ:
-            # XXX we need to find out why this fails on travis
-            return
         self.assertEqual(self.arbiter.watchers[0].arbiter,
                          self.arbiter)