Skip to content

Commit 62ed793

Browse files
maciektrmaciektr
authored
Temporarily default to primitive resolver (#1892)
1 parent ee7f7a2 commit 62ed793

File tree

5 files changed

+18
-66
lines changed

5 files changed

+18
-66
lines changed

‎scarb/src/resolver/mod.rs

+10-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ pub async fn resolve(
3838
let s = var.as_str();
3939
s == "true" || s == "1"
4040
})
41-
.unwrap_or(false);
41+
// Defaults to primitive!
42+
.unwrap_or(true);
4243
if algo_primitive {
4344
primitive::resolve(summaries, registry, lockfile).await
4445
} else {
@@ -252,6 +253,7 @@ mod tests {
252253
}
253254

254255
#[test]
256+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
255257
fn backtrack_1() {
256258
check(
257259
registry![
@@ -268,6 +270,7 @@ mod tests {
268270
}
269271

270272
#[test]
273+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
271274
fn backtrack_2() {
272275
check(
273276
registry![
@@ -313,6 +316,7 @@ mod tests {
313316
}
314317

315318
#[test]
319+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
316320
fn sub_dependencies() {
317321
check(
318322
registry![
@@ -341,6 +345,7 @@ mod tests {
341345
}
342346

343347
#[test]
348+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
344349
fn unsatisfied_version_constraint() {
345350
check(
346351
registry![("foo v2.0.0", []),],
@@ -359,6 +364,7 @@ mod tests {
359364
}
360365

361366
#[test]
367+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
362368
fn no_matching_transient_dependency_1() {
363369
check(
364370
registry![
@@ -375,6 +381,7 @@ mod tests {
375381
}
376382

377383
#[test]
384+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
378385
fn no_matching_transient_dependency_2() {
379386
check(
380387
registry![
@@ -395,6 +402,7 @@ mod tests {
395402
}
396403

397404
#[test]
405+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
398406
fn no_matching_transient_dependency_3() {
399407
check(
400408
registry![
@@ -509,6 +517,7 @@ mod tests {
509517
}
510518

511519
#[test]
520+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
512521
fn lock_conflict_1() {
513522
check_with_lock(
514523
registry![("foo v1.0.0", []),],

‎scarb/tests/add.rs

+1
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ fn path_version() {
183183
}
184184

185185
#[test]
186+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
186187
fn runs_resolver_if_network_is_allowed() {
187188
let t = TempDir::new().unwrap();
188189

‎scarb/tests/git_source_network.rs

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use scarb_test_support::command::Scarb;
99
use scarb_test_support::project_builder::{Dep, DepBuilder, ProjectBuilder};
1010

1111
#[test]
12+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
1213
fn https_something_happens() {
1314
thread::scope(|ts| {
1415
let server = TcpListener::bind("127.0.0.1:0").unwrap();
@@ -48,6 +49,7 @@ fn https_something_happens() {
4849
}
4950

5051
#[test]
52+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
5153
fn ssh_something_happens() {
5254
thread::scope(|ts| {
5355
let server = TcpListener::bind("127.0.0.1:0").unwrap();

‎scarb/tests/http_registry.rs

+2-65
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,6 @@ fn usage() {
7171
7272
###
7373
74-
GET /index/3/b/bar.json
75-
accept: */*
76-
accept-encoding: gzip, br, deflate
77-
host: ...
78-
if-none-match: ...
79-
user-agent: ...
80-
81-
304 Not Modified
82-
content-length: 0
83-
etag: ...
84-
85-
###
86-
8774
GET /bar-1.0.0.tar.zst
8875
accept: */*
8976
accept-encoding: gzip, br, deflate
@@ -161,19 +148,6 @@ fn publish_verified() {
161148
162149
###
163150
164-
GET /index/3/b/bar.json
165-
accept: */*
166-
accept-encoding: gzip, br, deflate
167-
host: ...
168-
if-none-match: ...
169-
user-agent: ...
170-
171-
304 Not Modified
172-
content-length: 0
173-
etag: ...
174-
175-
###
176-
177151
GET /bar-1.0.0.tar.zst
178152
accept: */*
179153
accept-encoding: gzip, br, deflate
@@ -191,6 +165,7 @@ fn publish_verified() {
191165
}
192166

193167
#[test]
168+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
194169
fn not_found() {
195170
let mut registry = HttpRegistry::serve(None);
196171
registry.publish(|t| {
@@ -254,6 +229,7 @@ fn not_found() {
254229
}
255230

256231
#[test]
232+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
257233
fn missing_config_json() {
258234
let registry = HttpRegistry::serve(None);
259235
fs::remove_file(registry.child("api/v1/index/config.json")).unwrap();
@@ -377,19 +353,6 @@ fn caching() {
377353
378354
###
379355
380-
GET /index/3/b/bar.json
381-
accept: */*
382-
accept-encoding: gzip, br, deflate
383-
host: ...
384-
if-none-match: ...
385-
user-agent: ...
386-
387-
304 Not Modified
388-
content-length: 0
389-
etag: ...
390-
391-
###
392-
393356
GET /bar-1.0.0.tar.zst
394357
accept: */*
395358
accept-encoding: gzip, br, deflate
@@ -428,32 +391,6 @@ fn caching() {
428391
304 Not Modified
429392
content-length: 0
430393
etag: ...
431-
432-
###
433-
434-
GET /index/3/b/bar.json
435-
accept: */*
436-
accept-encoding: gzip, br, deflate
437-
host: ...
438-
if-none-match: ...
439-
user-agent: ...
440-
441-
304 Not Modified
442-
content-length: 0
443-
etag: ...
444-
445-
###
446-
447-
GET /index/3/b/bar.json
448-
accept: */*
449-
accept-encoding: gzip, br, deflate
450-
host: ...
451-
if-none-match: ...
452-
user-agent: ...
453-
454-
304 Not Modified
455-
content-length: 0
456-
etag: ...
457394
"#]];
458395
expected.assert_eq(&registry.logs());
459396
}

‎scarb/tests/local_registry.rs

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ fn usage() {
3838
}
3939

4040
#[test]
41+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
4142
fn not_found() {
4243
let mut registry = LocalRegistry::create();
4344
registry.publish(|t| {
@@ -75,6 +76,7 @@ fn not_found() {
7576
// TODO(mkaput): Test path dependencies overrides.
7677

7778
#[test]
79+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
7880
fn empty_registry() {
7981
let registry = LocalRegistry::create();
8082

@@ -100,6 +102,7 @@ fn empty_registry() {
100102
}
101103

102104
#[test]
105+
#[ignore = "TODO(#1883): Unignore after fixing pubgrub and changing default registry."]
103106
fn url_pointing_to_file() {
104107
let registry_t = TempDir::new().unwrap();
105108
let registry = registry_t.child("r");

0 commit comments

Comments
 (0)