Adjust memtest and random_sha for python 3 and enable test.sh

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/Makefile b/Makefile
index a8541b50e1d2025c3602e2abcaa5d8fe545e441e..4c232f40b80d5fd8cb985335e4125026f686521c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -168,6 +168,7 @@ runtests-python: all t/tmp
            | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \
            | tee -a t/tmp/test-log/$$$$.log
 
 cmdline_tests := \

+  t/test.sh \

   t/test-argv \
   t/test-cat-file.sh \
   t/test-command-without-init-fails.sh \
   t/test-argv \
   t/test-cat-file.sh \
   t/test-command-without-init-fails.sh \


@@ -207,8 +208,7 @@ ifeq "2" "$(bup_python_majver)"
     t/test-fuse.sh \
     t/test-index-check-device.sh \
     t/test-restore-map-owner.sh \
     t/test-fuse.sh \
     t/test-index-check-device.sh \
     t/test-restore-map-owner.sh \

-    t/test-xdev.sh \
-    t/test.sh
+    t/test-xdev.sh

 endif
 
 tmp-target-run-test-get-%: all t/tmp
 endif
 
 tmp-target-run-test-get-%: all t/tmp

diff --git a/cmd/memtest-cmd.py b/cmd/memtest-cmd.py
index 3dc47dacc752c01c03da3aa9c8453808ce0c51a1..bf5f0d5a2b9365e7fd5ccef0ba206238d76cc5e9 100755 (executable)
--- a/cmd/memtest-cmd.py
+++ b/cmd/memtest-cmd.py
@@ -11,6 +11,7 @@ import sys, re, struct, time, resource
 from bup import git, bloom, midx, options, _helpers
 from bup.compat import range
 from bup.helpers import handle_ctrl_c
 from bup import git, bloom, midx, options, _helpers
 from bup.compat import range
 from bup.helpers import handle_ctrl_c

+from bup.io import byte_stream

 
 
 handle_ctrl_c()
 
 
 handle_ctrl_c()


@@ -22,7 +23,7 @@ def linux_memstat():
     #fields = ['VmSize', 'VmRSS', 'VmData', 'VmStk', 'ms']
     d = {}
     try:
     #fields = ['VmSize', 'VmRSS', 'VmData', 'VmStk', 'ms']
     d = {}
     try:

-        f = open('/proc/self/status')
+        f = open(b'/proc/self/status', 'rb')

     except IOError as e:
         if not _linux_warned:
             log('Warning: %s\n' % e)
     except IOError as e:
         if not _linux_warned:
             log('Warning: %s\n' % e)


@@ -33,7 +34,7 @@ def linux_memstat():
         # happens, this split() might not return two elements.  We don't
         # really need to care about the binary format since this output
         # isn't used for much and report() can deal with missing entries.
         # happens, this split() might not return two elements.  We don't
         # really need to care about the binary format since this output
         # isn't used for much and report() can deal with missing entries.

-        t = re.split(r':\s*', line.strip(), 1)
+        t = re.split(br':\s*', line.strip(), 1)

         if len(t) == 2:
             k,v = t
             d[k] = v
         if len(t) == 2:
             k,v = t
             d[k] = v


@@ -41,14 +42,14 @@ def linux_memstat():
 
 
 last = last_u = last_s = start = 0
 
 
 last = last_u = last_s = start = 0

-def report(count):
+def report(count, out):

     global last, last_u, last_s, start
     headers = ['RSS', 'MajFlt', 'user', 'sys', 'ms']
     ru = resource.getrusage(resource.RUSAGE_SELF)
     now = time.time()
     global last, last_u, last_s, start
     headers = ['RSS', 'MajFlt', 'user', 'sys', 'ms']
     ru = resource.getrusage(resource.RUSAGE_SELF)
     now = time.time()

-    rss = int(ru.ru_maxrss/1024)
+    rss = int(ru.ru_maxrss // 1024)

     if not rss:
     if not rss:

-        rss = linux_memstat().get('VmRSS', '??')
+        rss = linux_memstat().get(b'VmRSS', b'??')

     fields = [rss,
               ru.ru_majflt,
               int((ru.ru_utime - last_u) * 1000),
     fields = [rss,
               ru.ru_majflt,
               int((ru.ru_utime - last_u) * 1000),


@@ -56,11 +57,12 @@ def report(count):
               int((now - last) * 1000)]
     fmt = '%9s  ' + ('%10s ' * len(fields))
     if count >= 0:
               int((now - last) * 1000)]
     fmt = '%9s  ' + ('%10s ' * len(fields))
     if count >= 0:

-        print(fmt % tuple([count] + fields))
+        line = fmt % tuple([count] + fields)
+        out.write(line.encode('ascii') + b'\n')

     else:
         start = now
     else:
         start = now

-        print(fmt % tuple([''] + headers))
-    sys.stdout.flush()
+        out.write((fmt % tuple([''] + headers)).encode('ascii') + b'\n')
+    out.flush()

 
     # don't include time to run report() in usage counts
     ru = resource.getrusage(resource.RUSAGE_SELF)
 
     # don't include time to run report() in usage counts
     ru = resource.getrusage(resource.RUSAGE_SELF)


@@ -84,11 +86,14 @@ if extra:
     o.fatal('no arguments expected')
 
 git.check_repo_or_die()
     o.fatal('no arguments expected')
 
 git.check_repo_or_die()

-m = git.PackIdxList(git.repo('objects/pack'), ignore_midx=opt.ignore_midx)
+m = git.PackIdxList(git.repo(b'objects/pack'), ignore_midx=opt.ignore_midx)

 
 

-report(-1)
+sys.stdout.flush()
+out = byte_stream(sys.stdout)
+
+report(-1, out)

 _helpers.random_sha()
 _helpers.random_sha()

-report(0)
+report(0, out)

 
 if opt.existing:
     def foreverit(mi):
 
 if opt.existing:
     def foreverit(mi):


@@ -110,18 +115,18 @@ for c in range(opt.cycles):
             # a collision in sha-1 by accident, which is so unlikely that
             # we don't care.
             assert(not m.exists(bin))
             # a collision in sha-1 by accident, which is so unlikely that
             # we don't care.
             assert(not m.exists(bin))

-    report((c+1)*opt.number)
+    report((c+1)*opt.number, out)

 
 if bloom._total_searches:
 
 if bloom._total_searches:

-    print('bloom: %d objects searched in %d steps: avg %.3f steps/object'
-          % (bloom._total_searches, bloom._total_steps,
-             bloom._total_steps*1.0/bloom._total_searches))
+    out.write(b'bloom: %d objects searched in %d steps: avg %.3f steps/object\n'
+              % (bloom._total_searches, bloom._total_steps,
+                 bloom._total_steps*1.0/bloom._total_searches))

 if midx._total_searches:
 if midx._total_searches:

-    print('midx: %d objects searched in %d steps: avg %.3f steps/object'
-          % (midx._total_searches, midx._total_steps,
-             midx._total_steps*1.0/midx._total_searches))
+    out.write(b'midx: %d objects searched in %d steps: avg %.3f steps/object\n'
+              % (midx._total_searches, midx._total_steps,
+                 midx._total_steps*1.0/midx._total_searches))

 if git._total_searches:
 if git._total_searches:

-    print('idx: %d objects searched in %d steps: avg %.3f steps/object'
-          % (git._total_searches, git._total_steps,
-             git._total_steps*1.0/git._total_searches))
-print('Total time: %.3fs' % (time.time() - start))
+    out.write(b'idx: %d objects searched in %d steps: avg %.3f steps/object\n'
+              % (git._total_searches, git._total_steps,
+                 git._total_steps*1.0/git._total_searches))
+out.write(b'Total time: %.3fs\n' % (time.time() - start))

diff --git a/lib/bup/_helpers.c b/lib/bup/_helpers.c
index d325578fcace65d16bf554d53b0b682c2ce95ea1..312ecd4528a1376c7e9ced35e7fe33336b633628 100644 (file)
--- a/lib/bup/_helpers.c
+++ b/lib/bup/_helpers.c
@@ -1164,7 +1164,7 @@ static PyObject *random_sha(PyObject *self, PyObject *args)
     memset(shabuf, 0, sizeof(shabuf));
     for (i=0; i < 20/4; i++)
        shabuf[i] = random();
     memset(shabuf, 0, sizeof(shabuf));
     for (i=0; i < 20/4; i++)
        shabuf[i] = random();

-    return Py_BuildValue("s#", shabuf, 20);
+    return Py_BuildValue(rbuf_argf, shabuf, 20);

 }
 
 
 }