Increasing test file size to 50MB and removed the assertion of a block zero,baserock/morph

as that will happen at block number rollover. Closes issue #36.

5 files changed, 8 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 7c2e735..e432da3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ sdist:
 	PYTHONPATH=$(PYTHONPATH) $(PY) setup.py sdist
 
 test:
-	PYTHONPATH=$(PYTHONPATH) $(PY) t/test.py
+	PYTHONPATH=$(PYTHONPATH) $(PY) t/test.py 2>&1 | tee test.log
 
 clean:
 	rm -rf dist src tftpy-doc* MANIFEST
diff --git a/t/100KBFILE b/t/100KBFILE
deleted file mode 100644
index 77efc8d..0000000
--- a/t/100KBFILE
+++ /dev/null
diff --git a/t/foo/100KBFILE b/t/foo/100KBFILE
deleted file mode 100644
index 77efc8d..0000000
--- a/t/foo/100KBFILE
+++ /dev/null
diff --git a/t/test.py b/t/test.py
index ceeb8d5..ac63d16 100644
--- a/t/test.py
+++ b/t/test.py
@@ -145,7 +145,7 @@ class TestTftpyState(unittest.TestCase):
         """Fire up a client and a server and do an upload."""
         root = '/tmp'
         home = os.path.dirname(os.path.abspath(__file__))
-        filename = '100KBFILE'
+        filename = '50MBFILE'
         input_path = os.path.join(home, filename)
         if not input:
             input = input_path
@@ -183,7 +183,7 @@ class TestTftpyState(unittest.TestCase):
             # parent - let the server start
             try:
                 time.sleep(1)
-                client.download('100KBFILE',
+                client.download('50MBFILE',
                                 output)
             finally:
                 os.kill(child_pid, 15)
@@ -207,11 +207,11 @@ class TestTftpyState(unittest.TestCase):
         self.clientServerUploadOptions({})
 
     def testClientServerUploadFileObj(self):
-        fileobj = open('/tmp/100KBFILE', 'r')
+        fileobj = open('/tmp/50MBFILE', 'r')
         self.clientServerUploadOptions({}, input=fileobj)
 
     def testClientServerUploadWithSubdirs(self):
-        self.clientServerUploadOptions({}, transmitname='foo/bar/100KBFILE')
+        self.clientServerUploadOptions({}, transmitname='foo/bar/50MBFILE')
 
     def testClientServerUploadOptions(self):
         for blksize in [512, 1024, 2048, 4096]:
@@ -237,7 +237,7 @@ class TestTftpyState(unittest.TestCase):
                                     tftpy.TftpContextServer) )
 
         rrq = tftpy.TftpPacketRRQ()
-        rrq.filename = '100KBFILE'
+        rrq.filename = '50MBFILE'
         rrq.mode = 'octet'
         rrq.options = {}
 
@@ -274,7 +274,7 @@ class TestTftpyState(unittest.TestCase):
                                     tftpy.TftpContextServer) )
 
         rrq = tftpy.TftpPacketRRQ()
-        rrq.filename = 'foo/100KBFILE'
+        rrq.filename = 'foo/50MBFILE'
         rrq.mode = 'octet'
         rrq.options = {}
 
@@ -324,7 +324,7 @@ class TestTftpyState(unittest.TestCase):
                                               timeout,
                                               root)
         rrq = tftpy.TftpPacketRRQ()
-        rrq.filename = '100KBFILE'
+        rrq.filename = '50MBFILE'
         rrq.mode = 'octet'
         rrq.options = {}
 
diff --git a/tftpy/TftpStates.py b/tftpy/TftpStates.py
index 8e4ad1e..bfd10c7 100644
--- a/tftpy/TftpStates.py
+++ b/tftpy/TftpStates.py
@@ -84,7 +84,6 @@ class TftpState(object):
             import time
             log.debug("Deliberately delaying 10 seconds...")
             time.sleep(10)
-        tftpassert( blocknumber > 0, "There is no block zero!" )
         dat = None
         blksize = self.context.getBlocksize()
         buffer = self.context.fileobj.read(blksize)