From 03cad84044abe41eebf13dd2d928b1f9793d7d96 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Tue, 31 Dec 2019 02:37:01 +0000 Subject: [PATCH] failure: re-enable tests --- src/failure/debian/changelog | 4 ++-- src/failure/debian/patches/series | 1 + .../debian/patches/test-expect-backtrace.patch | 13 +++++++++++++ src/failure/debian/rules | 8 -------- src/failure/debian/rules.debcargo.hint | 6 ------ 5 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 src/failure/debian/patches/series create mode 100644 src/failure/debian/patches/test-expect-backtrace.patch delete mode 100644 src/failure/debian/rules delete mode 100755 src/failure/debian/rules.debcargo.hint diff --git a/src/failure/debian/changelog b/src/failure/debian/changelog index 3d332bfa8..3bfc14efa 100644 --- a/src/failure/debian/changelog +++ b/src/failure/debian/changelog @@ -1,9 +1,9 @@ rust-failure (0.1.6-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium * Package failure 0.1.6 from crates.io using debcargo 2.4.0 - * Only skip tests, still run a test build. + * Restore running tests. - -- Ximin Luo Tue, 31 Dec 2019 02:06:56 +0000 + -- Ximin Luo Tue, 31 Dec 2019 02:18:53 +0000 rust-failure (0.1.6-1) unstable; urgency=medium diff --git a/src/failure/debian/patches/series b/src/failure/debian/patches/series new file mode 100644 index 000000000..87a0372e0 --- /dev/null +++ b/src/failure/debian/patches/series @@ -0,0 +1 @@ +test-expect-backtrace.patch diff --git a/src/failure/debian/patches/test-expect-backtrace.patch b/src/failure/debian/patches/test-expect-backtrace.patch new file mode 100644 index 000000000..cce8de9d4 --- /dev/null +++ b/src/failure/debian/patches/test-expect-backtrace.patch @@ -0,0 +1,13 @@ +Description: Debian's tests run with RUST_BACKTRACE=1 which breaks this test; + make it more lenient. +--- a/src/error/mod.rs ++++ b/src/error/mod.rs +@@ -225,7 +225,7 @@ + let error: Error = io::Error::new(io::ErrorKind::NotFound, "test").into(); + assert!(error.downcast_ref::().is_some()); + let _: ::Backtrace = *error.backtrace(); +- assert_eq!(format!("{:?}", io_error), format!("{:?}", error)); ++ assert_eq!(Some(format!("{:?}", io_error).as_str()), format!("{:?}", error).lines().next()); + assert_eq!(format!("{}", io_error), format!("{}", error)); + drop(error); + assert!(true); diff --git a/src/failure/debian/rules b/src/failure/debian/rules deleted file mode 100644 index e96c0fb00..000000000 --- a/src/failure/debian/rules +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --buildsystem cargo - -override_dh_auto_test: - dh_auto_test -# tests fail for some reason TODO investigate -# dh_auto_test -- test --all diff --git a/src/failure/debian/rules.debcargo.hint b/src/failure/debian/rules.debcargo.hint deleted file mode 100755 index 92c239b45..000000000 --- a/src/failure/debian/rules.debcargo.hint +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --buildsystem cargo - -override_dh_auto_test: - dh_auto_test -- test --all -- 2.39.5