[Git][reproducible-builds/diffoscope][master] 2 commits: Always allow all unavoidable test output test fixtures.

Chris Lamb gitlab at salsa.debian.org
Mon Jan 13 17:57:34 UTC 2020



Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
abfd2b0f by Chris Lamb at 2020-01-13T17:45:35+00:00
Always allow all unavoidable test output test fixtures.

- - - - -
db108488 by Chris Lamb at 2020-01-13T17:56:37+00:00
Actually test the output of the test_html_regression_875281 presenter test. (Re: #84)

- - - - -


3 changed files:

- + tests/data/output_regression_875281.html
- tests/test_presenters.py
- tests/test_source.py


Changes:

=====================================
tests/data/output_regression_875281.html
=====================================
@@ -0,0 +1,51 @@
+ class="diffoscope">
+<div class="difference">
+  <div class="diffheader">
+  <div class="diffcontrol diffcontrol-double">⊟</div>
+  <div><span class="diffsize">4.82 MB</span></div>
+  <div><span class="source">b1</span> vs.</div>
+  <div ><span class="source">b2</span>
+    <a class="anchor" href="#">¶</a>
+  </div>
+  </div>
+  <div class="difference">
+    <div class="diffheader">
+    <div class="diffcontrol">⊟</div>
+    <div><span class="diffsize">141 KB</span></div>
+    <div id="build.log"><span class="source">build.log</span>
+      <a class="anchor" href="#build.log">¶</a>
+    </div>
+    </div>
+<div class="error">Max HTML report size reached</div>
+  </div>
+  <div class="difference">
+    <div class="diffheader">
+    <div class="diffcontrol">⊟</div>
+    <div><span class="diffsize">1.56 MB</span></div>
+    <div id="systemtap-doc_-.---_all.deb"><span class="source">systemtap-doc_3.1-2_all.deb</span>
+      <a class="anchor" href="#systemtap-doc_-.---_all.deb">¶</a>
+    </div>
+    </div>
+<div class="error">Max HTML report size reached</div>
+  </div>
+  <div class="difference">
+    <div class="diffheader">
+    <div class="diffcontrol">⊟</div>
+    <div><span class="diffsize">1.56 MB</span></div>
+    <div id="systemtap_-.---_arm--.buildinfo"><span class="source">systemtap_3.1-2_arm64.buildinfo</span>
+      <a class="anchor" href="#systemtap_-.---_arm--.buildinfo">¶</a>
+    </div>
+    </div>
+<div class="error">Max HTML report size reached</div>
+  </div>
+  <div class="difference">
+    <div class="diffheader">
+    <div class="diffcontrol">⊟</div>
+    <div><span class="diffsize">1.56 MB</span></div>
+    <div id="systemtap_-.---_arm--.changes"><span class="source">systemtap_3.1-2_arm64.changes</span>
+      <a class="anchor" href="#systemtap_-.---_arm--.changes">¶</a>
+    </div>
+    </div>
+<div class="error">Max HTML report size reached</div>
+  </div>
+</div>


=====================================
tests/test_presenters.py
=====================================
@@ -195,6 +195,11 @@ def test_html_regression_875281(tmpdir, capsys):
     )
     assert out == ''
 
+    with open(report_path, 'r', encoding='utf-8') as f:
+        assert extract_body(f.read()) == get_data(
+            'output_regression_875281.html'
+        )
+
 
 def test_limited_print():
     def fake(x):


=====================================
tests/test_source.py
=====================================
@@ -230,11 +230,6 @@ ALLOWED_TEST_FILES = {
     'debian-bug-875281.collapsed-diff.json',
     'order1a.json',
     'order1b.json',
-    'output.colored.txt',
-    'output.json',
-    'output.md',
-    'output.rst',
-    'output.txt',
 }
 
 
@@ -287,6 +282,7 @@ def test_does_not_add_new_test_files():
             or x.endswith('.diff')
             or '_diff_' in x
             or 'diff.' in x
+            or x.startswith('output')
         ):
             continue
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/c150ae8e62f3779ae7617c814e8e7203123a67ad...db108488f475ce3ea33aad7084a410f6a03bebac

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/c150ae8e62f3779ae7617c814e8e7203123a67ad...db108488f475ce3ea33aad7084a410f6a03bebac
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20200113/796f75aa/attachment.htm>


More information about the rb-commits mailing list