From e4f038da38f1bccd82a97555c717466556eb93d5 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Thu, 14 Mar 2019 17:46:52 +0100
Subject: [PATCH] [test][worker] Code cleanup
---
beat/core/test/test_worker.py | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/beat/core/test/test_worker.py b/beat/core/test/test_worker.py
index 720eec28..fecaec35 100644
--- a/beat/core/test/test_worker.py
+++ b/beat/core/test/test_worker.py
@@ -37,19 +37,12 @@
# Tests for experiment execution
import os
-
import logging
-
-logger = logging.getLogger(__name__)
-
import unittest
import simplejson
import multiprocessing
+import queue
-try:
- import Queue
-except ImportError:
- import queue as Queue
from time import time
from time import sleep
@@ -60,6 +53,9 @@ from ..utils import find_free_port
from . import prefix, tmp_prefix
+
+logger = logging.getLogger(__name__)
+
# ----------------------------------------------------------
@@ -165,7 +161,7 @@ class ControllerProcess(multiprocessing.Process):
command = self.queue.get_nowait()
if command == "STOP":
break
- except Queue.Empty:
+ except queue.Empty:
pass
self.controller.destroy()
@@ -390,7 +386,7 @@ class TestOneWorker(TestWorkerBase):
return message
def _check_done(self, message, expected_worker, expected_job_id):
- self.assertTrue(message is not None)
+ self.assertIsNotNone(message)
(worker, status, job_id, data) = message
--
GitLab