From 407c6a5db6c1f1cfb40bd6113f07f067d07885a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Origin: https://github.com/mustache/mustache/pull/258
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954503
Date: Mon, 27 Apr 2020 11:16:17 +0200
Subject: [PATCH] Fix test race condition.

The test suite randomly fails with errors such as:

~~~
  1) Failure:
AutoloadingTest#test_autoload_lowercase [/builddir/build/BUILD/mustache-1.1.1/usr/share/gems/gems/mustache-1.1.1/test/autoloading_test.rb:17]:
Expected: Comments
  Actual: nil
~~~

This happens when `test_namespaced*` test cases are executed earlier
than the remaining test cases, because they are defining
`view_namespace` but not cleaning up afterwards.
---
 test/autoloading_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/autoloading_test.rb b/test/autoloading_test.rb
index 0a7ad762..77eb3557 100644
--- a/test/autoloading_test.rb
+++ b/test/autoloading_test.rb
@@ -7,6 +7,10 @@ def setup
     Mustache.view_path = File.dirname(__FILE__) + '/fixtures'
   end
 
+  def teardown
+    Mustache.remove_instance_variable(:@view_namespace) if Mustache.instance_variable_defined?(:@view_namespace)
+  end
+
   def test_autoload
     klass = Mustache.view_class(:Comments)
     assert_equal Comments, klass
ts/security-token.scm?id=9b3e11f6a874be3412aacd94634de74e1c70cd53'>commit</a><a href='/guix/diff/gnu/tests/security-token.scm?id=9b3e11f6a874be3412aacd94634de74e1c70cd53'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/security-token.scm'>
<input type='hidden' name='id' value='9b3e11f6a874be3412aacd94634de74e1c70cd53'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=9b3e11f6a874be3412aacd94634de74e1c70cd53'>root</a>/<a href='/guix/log/gnu?id=9b3e11f6a874be3412aacd94634de74e1c70cd53'>gnu</a>/<a href='/guix/log/gnu/tests?id=9b3e11f6a874be3412aacd94634de74e1c70cd53'>tests</a>/<a href='/guix/log/gnu/tests/security-token.scm?id=9b3e11f6a874be3412aacd94634de74e1c70cd53'>security-token.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/tests/security-token.scm?id=9b3e11f6a874be3412aacd94634de74e1c70cd53&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-08-16 02:46:27 +0530'>2018-08-16</span></td><td><a href='/guix/commit/gnu/tests/security-token.scm?id=de30205ba0f63eb987097a9f47b6e4fd38cd9044'>gnu: services: Add pcscd service.</a><span class='msg-avail'>...</span></td><td>Arun Isaac</td></tr>