From 8defdf38432d215a814018f6aa5446a3b03488af Mon Sep 17 00:00:00 2001
From: Julen Landa Alustiza <jlanda@fedoraproject.org>
Date: Mar 02 2020 09:54:38 +0000
Subject: [PATCH 1/3] tests: fix users activity tests


---

diff --git a/tests/test_pagure_flask_api_user.py b/tests/test_pagure_flask_api_user.py
index 5d9073c..3331f8d 100644
--- a/tests/test_pagure_flask_api_user.py
+++ b/tests/test_pagure_flask_api_user.py
@@ -465,10 +465,13 @@ class PagureFlaskApiUSertests(tests.Modeltests):
         """
         tests.create_projects(self.session)
 
-        today = datetime.datetime.utcnow().date()
-        # 02-15 on current year could be in the future, so use last year date
-        # always to ensure that 02-15 is not a future date
-        year = today.year - 1
+        today = datetime.datetime.utcnow()
+        # stats/activty returns data for now()-1year time range, so alter
+        # year as needed to select 15th feb of current or previous year
+        if today < datetime.datetime(today.year, 2, 15, 3, 30):
+            year = today.year - 1
+        else:
+            year = today.year
 
         dateobj = datetime.datetime(year, 2, 15, 3, 30)
         utcdate = "%s-02-15" % year
@@ -579,10 +582,13 @@ class PagureFlaskApiUSertests(tests.Modeltests):
         """
         tests.create_projects(self.session)
 
-        today = datetime.datetime.utcnow().date()
-        # 02-15 on current year could be in the future, so use last year date
-        # always to ensure that 02-15 is not a future date
-        year = today.year - 1
+        today = datetime.datetime.utcnow()
+        # stats/activty returns data for now()-1year time range, so alter
+        # year as needed to select 15th feb of current or previous year
+        if today < datetime.datetime(today.year, 2, 15, 3, 30):
+            year = today.year - 1
+        else:
+            year = today.year
 
         dateobj = datetime.datetime(year, 2, 15, 22, 30)
         utcdate = "%s-02-15" % year

From 7b693496661d0a53980c1e9cfa94fd49e3574ef9 Mon Sep 17 00:00:00 2001
From: Julen Landa Alustiza <jlanda@fedoraproject.org>
Date: Mar 02 2020 12:27:07 +0000
Subject: [PATCH 2/3] tox: lock pygit2 version on ci environment since we lack libgit2 0.99


---

diff --git a/tox.ini b/tox.ini
index 3db18ed..4b0c806 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@ deps =
     flask012: flask>=0.12,<0.13
     flask100: flask>=1.0,<1.1
     -rrequirements-testing.txt
+    ci: pygit2<1.1.0
     ci: -rrequirements-ev.txt
     ci: psycopg2<2.8
     ci: python-openid

From f83d482d0d54df2a6102aaf4f571d578c732f9bc Mon Sep 17 00:00:00 2001
From: Julen Landa Alustiza <jlanda@fedoraproject.org>
Date: Mar 02 2020 15:07:48 +0000
Subject: [PATCH 3/3] tests: support python markdown >= 3.2.0


---

diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index b1b625a..1fce56a 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -4202,7 +4202,8 @@ class PagureLibtests(tests.Modeltests):
             markdown_v = markdown.__version__.version_info
         except AttributeError:  # pragma: no cover
             markdown_v = markdown.__version_info__
-        old_markdown = markdown_v < (2, 6, 0)
+        # python-markdown >= 3.2.0 returns to the old behavior on img tag trailing slash
+        old_markdown = markdown_v < (2, 6, 0) or markdown_v >= (3, 2, 0)
 
         texts = [
             "foo bar test#1 see?",