added more tests for better coverage. Total

package coverage is around 89% right now.

Author: Matt George

tests/__init__.py

@@ -43,9 +43,18 @@ def perform(sleep_time):
         import time
         time.sleep(sleep_time)
         print 'Done Sleeping'
+
 def test_str_to_class():
     ret = str_to_class('tests.Basic')
     assert ret
+    assert ret == Basic
+    assert str_to_class('hello.World') == None
+
+def test_safe_str_to_class():
+    from pyres import safe_str_to_class
+    assert safe_str_to_class('tests.Basic') == Basic
+    assert safe_str_to_class('test.Mine') == None
+    assert safe_str_to_class('hello.World') == None
 
 class PyResTests(unittest.TestCase):
     def setUp(self):

tests/test_resq.py

@@ -42,7 +42,7 @@ def test_redis_property(self):
         from redis import Redis
         rq = ResQ(server="localhost:6379")
         red = Redis()
-        rq2 = ResQ(server=red)
+        #rq2 = ResQ(server=red)
         self.assertRaises(Exception, rq.redis,[Basic])
 
     def test_info(self):
@@ -89,3 +89,4 @@ def test_keys(self):
         self.resq.enqueue_from_string('tests.Basic','basic','test1')
         assert 'queue:basic' in self.resq.keys()
         assert 'queues' in self.resq.keys()
+    

tests/test_worker.py

@@ -50,9 +50,11 @@ def test_processed(self):
         assert self.redis.exists("resque:stat:processed:%s" % name)
         assert self.redis.get("resque:stat:processed") == str(1)
         assert self.redis.get("resque:stat:processed:%s" % name) == str(1)
+        assert worker.get_processed() == 1
         worker.processed()
         assert self.redis.get("resque:stat:processed") == str(2)
         assert self.redis.get("resque:stat:processed:%s" % name) == str(2)
+        assert worker.get_processed() == 2
 
     def test_failed(self):
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
@@ -62,9 +64,11 @@ def test_failed(self):
         assert self.redis.exists("resque:stat:failed:%s" % name)
         assert self.redis.get("resque:stat:failed") == str(1)
         assert self.redis.get("resque:stat:failed:%s" % name) == str(1)
+        assert worker.get_failed() == 1
         worker.failed()
         assert self.redis.get("resque:stat:failed") == str(2)
         assert self.redis.get("resque:stat:failed:%s" % name) == str(2)
+        assert worker.get_failed() == 2
 
     def test_process(self):
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
@@ -112,6 +116,7 @@ def test_get_job(self):
         worker.working_on(job)
         name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
         assert worker.job() == ResQ.decode(self.redis.get('resque:worker:%s' % name))
+        assert worker.processing() == ResQ.decode(self.redis.get('resque:worker:%s' % name))
         worker.done_working()
         w2 = Worker(['basic'])
         print w2.job()
@@ -138,4 +143,16 @@ def test_started(self):
         assert self.redis.get('resque:worker:%s:started' % name) == dt.strftime('%Y-%m-%d %H:%M:%S')
         assert worker.started == datetime.datetime.strptime(dt.strftime('%Y-%m-%d %H:%M:%S'),'%Y-%m-%d %H:%M:%S')
         worker.started = None
-        assert not self.redis.exists('resque:worker:%s:started' % name)
+        assert not self.redis.exists('resque:worker:%s:started' % name)
+    
+    def test_state(self):
+        worker = Worker(['basic'])
+        assert worker.state() == 'idle'
+        self.resq.enqueue_from_string('tests.Basic','basic','test1')
+        worker.register_worker()
+        job = Job.reserve('basic', self.resq)
+        worker.working_on(job)
+        assert worker.state() == 'working'
+        worker.done_working()
+        assert worker.state() == 'idle'
+