Skip to content

Commit 587dc4e

Browse files
committed
TCs: fix div-by-zero on elapsed times (appveyor CPU is fast!)
1 parent 62202bb commit 587dc4e

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

Diff for: gitdb/test/performance/test_pack.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def test_pack_random_access(self):
3636
sha_list = list(pdb.sha_iter())
3737
elapsed = time() - st
3838
ns = len(sha_list)
39-
print("PDB: looked up %i shas by index in %f s ( %f shas/s )" % (ns, elapsed, ns / elapsed), file=sys.stderr)
39+
print("PDB: looked up %i shas by index in %f s ( %f shas/s )" % (ns, elapsed, ns / (elapsed or 1)), file=sys.stderr)
4040

4141
# sha lookup: best-case and worst case access
4242
pdb_pack_info = pdb._pack_info
@@ -51,7 +51,7 @@ def test_pack_random_access(self):
5151
del(pdb._entities)
5252
pdb.entities()
5353
print("PDB: looked up %i sha in %i packs in %f s ( %f shas/s )" %
54-
(ns, len(pdb.entities()), elapsed, ns / elapsed), file=sys.stderr)
54+
(ns, len(pdb.entities()), elapsed, ns / (elapsed or 1)), file=sys.stderr)
5555
# END for each random mode
5656

5757
# query info and streams only
@@ -62,7 +62,7 @@ def test_pack_random_access(self):
6262
pdb_fun(sha)
6363
elapsed = time() - st
6464
print("PDB: Obtained %i object %s by sha in %f s ( %f items/s )" %
65-
(max_items, pdb_fun.__name__.upper(), elapsed, max_items / elapsed), file=sys.stderr)
65+
(max_items, pdb_fun.__name__.upper(), elapsed, max_items / (elapsed or 1)), file=sys.stderr)
6666
# END for each function
6767

6868
# retrieve stream and read all
@@ -78,7 +78,7 @@ def test_pack_random_access(self):
7878
elapsed = time() - st
7979
total_kib = total_size / 1000
8080
print("PDB: Obtained %i streams by sha and read all bytes totallying %i KiB ( %f KiB / s ) in %f s ( %f streams/s )" %
81-
(max_items, total_kib, total_kib / elapsed, elapsed, max_items / elapsed), file=sys.stderr)
81+
(max_items, total_kib, total_kib / (elapsed or 1), elapsed, max_items / (elapsed or 1)), file=sys.stderr)
8282

8383
@skip_on_travis_ci
8484
def test_loose_correctness(self):
@@ -129,5 +129,5 @@ def test_correctness(self):
129129
# END for each entity
130130
elapsed = time() - st
131131
print("PDB: verified %i objects (crc=%i) in %f s ( %f objects/s )" %
132-
(count, crc, elapsed, count / elapsed), file=sys.stderr)
132+
(count, crc, elapsed, count / (elapsed or 1)), file=sys.stderr)
133133
# END for each verify mode

Diff for: gitdb/test/performance/test_pack_streaming.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ def test_pack_writing(self):
5252
# END gather objects for pack-writing
5353
elapsed = time() - st
5454
print("PDB Streaming: Got %i streams by sha in in %f s ( %f streams/s )" %
55-
(ni, elapsed, ni / elapsed), file=sys.stderr)
55+
(ni, elapsed, ni / (elapsed or 1)), file=sys.stderr)
5656

5757
st = time()
5858
PackEntity.write_pack((pdb.stream(sha) for sha in pdb.sha_iter()), ostream.write, object_count=ni)
5959
elapsed = time() - st
6060
total_kb = ostream.bytes_written() / 1000
6161
print(sys.stderr, "PDB Streaming: Wrote pack of size %i kb in %f s (%f kb/s)" %
62-
(total_kb, elapsed, total_kb / elapsed), sys.stderr)
62+
(total_kb, elapsed, total_kb / (elapsed or 1)), sys.stderr)
6363

6464
@skip_on_travis_ci
6565
def test_stream_reading(self):
@@ -82,4 +82,4 @@ def test_stream_reading(self):
8282
elapsed = time() - st
8383
total_kib = total_size / 1000
8484
print(sys.stderr, "PDB Streaming: Got %i streams by sha and read all bytes totallying %i KiB ( %f KiB / s ) in %f s ( %f streams/s )" %
85-
(ni, total_kib, total_kib / elapsed, elapsed, ni / elapsed), sys.stderr)
85+
(ni, total_kib, total_kib / (elapsed or 1), elapsed, ni / (elapsed or 1)), sys.stderr)

Diff for: gitdb/test/performance/test_stream.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test_large_data_streaming(self, path):
7070

7171
size_kib = size / 1000
7272
print("Added %i KiB (filesize = %i KiB) of %s data to loose odb in %f s ( %f Write KiB / s)" %
73-
(size_kib, fsize_kib, desc, elapsed_add, size_kib / elapsed_add), file=sys.stderr)
73+
(size_kib, fsize_kib, desc, elapsed_add, size_kib / (elapsed_add or 1)), file=sys.stderr)
7474

7575
# reading all at once
7676
st = time()
@@ -81,7 +81,7 @@ def test_large_data_streaming(self, path):
8181
stream.seek(0)
8282
assert shadata == stream.getvalue()
8383
print("Read %i KiB of %s data at once from loose odb in %f s ( %f Read KiB / s)" %
84-
(size_kib, desc, elapsed_readall, size_kib / elapsed_readall), file=sys.stderr)
84+
(size_kib, desc, elapsed_readall, size_kib / (elapsed_readall or 1)), file=sys.stderr)
8585

8686
# reading in chunks of 1 MiB
8787
cs = 512 * 1000
@@ -101,7 +101,7 @@ def test_large_data_streaming(self, path):
101101

102102
cs_kib = cs / 1000
103103
print("Read %i KiB of %s data in %i KiB chunks from loose odb in %f s ( %f Read KiB / s)" %
104-
(size_kib, desc, cs_kib, elapsed_readchunks, size_kib / elapsed_readchunks), file=sys.stderr)
104+
(size_kib, desc, cs_kib, elapsed_readchunks, size_kib / (elapsed_readchunks or 1)), file=sys.stderr)
105105

106106
# del db file so we keep something to do
107107
os.remove(db_file)

0 commit comments

Comments
 (0)