From cd5b6211b3f909031678e3ae50353ad6c705be51 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Mon, 22 Feb 2021 14:41:41 -0500
Subject: [PATCH] upgrade irctest to new, reintegrated master

---
 .travis.yml | 1 +
 Makefile    | 2 +-
 irctest     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 04e08788..2e8354c0 100644
--- 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
diff --git a/Makefile b/Makefile
index 2be9474a..ae0ca33e 100644
--- a/Makefile
+++ b/Makefile
@@ -45,4 +45,4 @@ gofmt:
 
 irctest:
 	git submodule update --init
-	cd irctest && make integration
+	cd irctest && make oragono
diff --git a/irctest b/irctest
index de49571b..10edb9dd 160000
--- a/irctest
+++ b/irctest
@@ -1 +1 @@
-Subproject commit de49571b1e66104b3dff8033a0333404f4be7a45
+Subproject commit 10edb9dd9dac7f42fbb25e36efff355a285fb5bd