From d7cf0bc00de9600312fa50fbb4b11548bd1b82d8 Mon Sep 17 00:00:00 2001 From: Isaiah Singletary Date: Tue, 7 Apr 2020 15:46:13 -0400 Subject: [PATCH 1/4] fixed the parameter order --- tests/rest/client/v1/test_events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/rest/client/v1/test_events.py b/tests/rest/client/v1/test_events.py index ffb2de1505f5..b54b06482b13 100644 --- a/tests/rest/client/v1/test_events.py +++ b/tests/rest/client/v1/test_events.py @@ -50,7 +50,7 @@ def make_homeserver(self, reactor, clock): return hs - def prepare(self, hs, reactor, clock): + def prepare(self, reactor, clock, hs): # register an account self.user_id = self.register_user("sid1", "pass") From 175e5aac6e3fa4bc3abc0cea3296e5fbd23dd1b9 Mon Sep 17 00:00:00 2001 From: Isaiah Singletary Date: Tue, 7 Apr 2020 15:49:29 -0400 Subject: [PATCH 2/4] changelog file --- changelog.d/1.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/1.bugfix diff --git a/changelog.d/1.bugfix b/changelog.d/1.bugfix new file mode 100644 index 000000000000..2e1dd25d2270 --- /dev/null +++ b/changelog.d/1.bugfix @@ -0,0 +1 @@ +The parameters in the [test_events.py](synapse/tests/rest/client/v1/test_events.py) in the prepare method were in the wrong order. This change fixes the order. Contributed by Isaiah Singletary. From 76f0b5ec5110ca258f5a0e0916080ac8d556ad21 Mon Sep 17 00:00:00 2001 From: Isaiah Singletary Date: Tue, 7 Apr 2020 16:57:34 -0400 Subject: [PATCH 3/4] modifying changelog --- changelog.d/7243.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7243.misc diff --git a/changelog.d/7243.misc b/changelog.d/7243.misc new file mode 100644 index 000000000000..a39c257a5431 --- /dev/null +++ b/changelog.d/7243.misc @@ -0,0 +1 @@ +Correct the parameters of a test fixture. Contributed by Isaiah Singletary. From 1f15a7d9e6cdc2308ab2e9e96c5086df83cb9d44 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 14 Apr 2020 15:11:01 -0400 Subject: [PATCH 4/4] Remove unnecessary newsfragment file --- changelog.d/1.bugfix | 1 - 1 file changed, 1 deletion(-) delete mode 100644 changelog.d/1.bugfix diff --git a/changelog.d/1.bugfix b/changelog.d/1.bugfix deleted file mode 100644 index 2e1dd25d2270..000000000000 --- a/changelog.d/1.bugfix +++ /dev/null @@ -1 +0,0 @@ -The parameters in the [test_events.py](synapse/tests/rest/client/v1/test_events.py) in the prepare method were in the wrong order. This change fixes the order. Contributed by Isaiah Singletary.