Changeset adf8cf0 for server


Ignore:
Timestamp:
Jan 12, 2012, 2:17:14 AM (12 years ago)
Author:
Jessica B. Hamrick <jhamrick@…>
Branches:
no-cups
Children:
b8c3505
Parents:
20f7360
git-author:
Jessica B. Hamrick <jhamrick@…> (01/12/12 02:17:14)
git-committer:
Jessica B. Hamrick <jhamrick@…> (01/12/12 02:17:14)
Message:

Remove lag times from job test cases and put them in the actual player.

Location:
server
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • server/lib/gutenbach/server/job.py

    ref387cf radf8cf0  
    44import logging
    55import os
    6 import time
    76
    87# initialize logger
  • server/lib/gutenbach/server/player.py

    r2620618 radf8cf0  
    2121            self._dryrun = False
    2222            self._dryrun_time = 0.5
     23            self._lag = 0.01
    2324
    2425    @property
     
    5152        with self.lock:
    5253            self._callback = val
     54
     55    def start(self):
     56        super(Player, self).start()
     57        time.sleep(self._lag)
    5358
    5459    def run(self):
     
    116121            else:
    117122                logger.warning("trying to pause non-playing job")
     123        time.sleep(self._lag)
    118124               
    119125    def mplayer_stop(self):
     
    127133            else:
    128134                logger.warning("trying to stop non-playing job")
     135        time.sleep(self._lag)
  • server/test/server/job.py

    r609a9b0 radf8cf0  
    142142    def testPlay(self):
    143143        self.job.play()
    144         time.sleep(0.01)
    145144        self.assertTrue(self.job.is_playing)
    146145
     
    155154    def testPause(self):
    156155        self.job.play()
    157         time.sleep(0.01)
    158156        self.assertTrue(self.job.is_playing)
    159157        self.assertFalse(self.job.is_paused)
     
    181179    def testCancel(self):
    182180        self.job.play()
    183         time.sleep(0.01)
    184181        self.assertTrue(self.job.is_playing)
    185182        self.assertFalse(self.job.is_cancelled)
    186183
    187184        self.job.cancel()
    188         time.sleep(0.01)
    189185        self.assertFalse(self.job.is_playing)
    190186        self.assertTrue(self.job.is_done)
     
    194190    def testAbort(self):
    195191        self.job.play()
    196         time.sleep(0.01)
    197192        self.assertTrue(self.job.is_playing)
    198193        self.assertFalse(self.job.is_aborted)
    199194
    200195        self.job.abort()
    201         time.sleep(0.01)
    202196        self.assertFalse(self.job.is_playing)
    203197        self.assertTrue(self.job.is_done)
Note: See TracChangeset for help on using the changeset viewer.