From: Vasudev Kamath <vasudev@copyninja.info>
Date: Wed, 8 Aug 2018 15:31:48 +0000 (+0530)
Subject: Refresh patch 2002
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=13496696d554a58887b4bf89e0cae58dd6181e08;p=cargo.git

Refresh patch 2002
---

diff --git a/debian/patches/2002_disable-net-tests.patch b/debian/patches/2002_disable-net-tests.patch
index d5d5860e3..bbb140b2a 100644
--- a/debian/patches/2002_disable-net-tests.patch
+++ b/debian/patches/2002_disable-net-tests.patch
@@ -693,7 +693,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +// }
 --- a/tests/testsuite/test.rs
 +++ b/tests/testsuite/test.rs
-@@ -3049,114 +3049,114 @@
+@@ -3093,114 +3093,114 @@
      );
  }
  
@@ -918,13 +918,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  fn test_release_ignore_panic() {
 --- a/tests/testsuite/generate_lockfile.rs
 +++ b/tests/testsuite/generate_lockfile.rs
-@@ -2,8 +2,8 @@
+@@ -1,9 +1,9 @@
+ use std::fs::{self, File};
  use std::io::prelude::*;
  
- use cargotest::support::{execs, project};
 -use cargotest::support::registry::Package;
--use cargotest::ChannelChanger;
 +// use cargotest::support::registry::Package;
+ use cargotest::support::{execs, paths, project, ProjectBuilder};
+-use cargotest::ChannelChanger;
 +// use cargotest::ChannelChanger;
  use hamcrest::{assert_that, existing_file, is_not};