Merge pull request #1555 from slingamn/irctest_upstream

upgrade irctest to new, reintegrated master
2021-02-22 15:36:14 -05:00 · 2021-02-22 15:36:14 -05:00 · 2681097516
parent 092f193326 cd5b6211b3
commit 2681097516
3 changed files with 3 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -13,6 +13,7 @@ branches:
 before_install:
  # https://github.com/travis-ci/travis-ci/issues/8361
  - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
+  - sudo apt-get install python3-pytest

 script:
 - make install
--- a/2
+++ b/2
@ -45,4 +45,4 @@ gofmt:

 irctest:
 	git submodule update --init
-	cd irctest && make integration
+	cd irctest && make oragono
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit de49571b1e66104b3dff8033a0333404f4be7a45
+Subproject commit 10edb9dd9dac7f42fbb25e36efff355a285fb5bd