Skip to content

Commit d7865cd

Browse files
committed
Switch over to rustpkg test
Range and json tests have to be completely ignored for now :(
1 parent 102a3c9 commit d7865cd

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ install:
66
before_script:
77
- ./travis/setup.sh
88
script:
9-
- rustc --test --cfg travis test.rs
10-
- ./test
9+
- rustpkg test

test.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use extra::comm::DuplexStream;
66
use extra::future::Future;
77
use extra::time;
88
use extra::time::Timespec;
9-
#[cfg(not(travis))] // Travis uses Postgres 9.1
109
use extra::json;
1110
use extra::uuid::Uuid;
1211
use std::f32;
@@ -311,7 +310,7 @@ fn test_bytea_params() {
311310
}
312311
313312
#[test]
314-
#[cfg(not(travis))] // Travis runs Postgres 9.1
313+
#[ignore]
315314
fn test_json_params() {
316315
test_type("JSON", [(Some(json::from_str("[10, 11, 12]").unwrap()),
317316
"'[10, 11, 12]'"),
@@ -381,13 +380,13 @@ macro_rules! test_range(
381380
)
382381
383382
#[test]
384-
#[cfg(not(travis))]
383+
#[ignore]
385384
fn test_int4range_params() {
386385
test_range!("INT4RANGE", i32, 100i32, "100", 200i32, "200")
387386
}
388387
389388
#[test]
390-
#[cfg(not(travis))]
389+
#[ignore]
391390
fn test_int8range_params() {
392391
test_range!("INT8RANGE", i64, 100i64, "100", 200i64, "200")
393392
}
@@ -402,13 +401,13 @@ fn test_timespec_range_params(sql_type: &str) {
402401
}
403402
404403
#[test]
405-
#[cfg(not(travis))]
404+
#[ignore]
406405
fn test_tsrange_params() {
407406
test_timespec_range_params("TSRANGE");
408407
}
409408
410409
#[test]
411-
#[cfg(not(travis))]
410+
#[ignore]
412411
fn test_tstzrange_params() {
413412
test_timespec_range_params("TSTZRANGE");
414413
}

0 commit comments

Comments
 (0)