@@ -344,43 +344,43 @@ fn compare_environments(env: PythonEnvironment, environment: PythonEnvironment,
344
344
let mut env = env. clone ( ) ;
345
345
let mut environment = environment. clone ( ) ;
346
346
347
- // assert_eq!(
348
- // env.category,
349
- // environment.clone().category,
350
- // "Category mismatch when using {} for {:?} and {:?}",
351
- // method,
352
- // environment,
353
- // env
354
- // );
355
-
356
- if env. category != environment. clone ( ) . category {
357
- error ! (
358
- "Category mismatch when using {} for {:?} and {:?}" ,
359
- method, environment, env
360
- ) ;
361
- }
347
+ assert_eq ! (
348
+ env. category,
349
+ environment. clone( ) . category,
350
+ "Category mismatch when using {} for {:?} and {:?}" ,
351
+ method,
352
+ environment,
353
+ env
354
+ ) ;
355
+
356
+ // if env.category != environment.clone().category {
357
+ // error!(
358
+ // "Category mismatch when using {} for {:?} and {:?}",
359
+ // method, environment, env
360
+ // );
361
+ // }
362
362
363
363
if let ( Some ( version) , Some ( expected_version) ) =
364
364
( environment. clone ( ) . version , env. clone ( ) . version )
365
365
{
366
- // assert!(
367
- // does_version_match(&version, &expected_version),
368
- // "Version mismatch when using {} for (expected {:?} to start with {:?}) for env = {:?} and environment = {:?}",
369
- // method,
370
- // expected_version,
371
- // version,
372
- // env.clone(),
373
- // environment.clone()
374
- // );
375
- if !does_version_match ( & version, & expected_version) {
376
- error ! ( "Version mismatch when using {} for (expected {:?} to start with {:?}) for env = {:?} and environment = {:?}" ,
366
+ assert ! (
367
+ does_version_match( & version, & expected_version) ,
368
+ "Version mismatch when using {} for (expected {:?} to start with {:?}) for env = {:?} and environment = {:?}" ,
377
369
method,
378
370
expected_version,
379
371
version,
380
372
env. clone( ) ,
381
373
environment. clone( )
382
- ) ;
383
- }
374
+ ) ;
375
+ // if !does_version_match(&version, &expected_version) {
376
+ // error!("Version mismatch when using {} for (expected {:?} to start with {:?}) for env = {:?} and environment = {:?}",
377
+ // method,
378
+ // expected_version,
379
+ // version,
380
+ // env.clone(),
381
+ // environment.clone()
382
+ // );
383
+ // }
384
384
}
385
385
// We have compared the versions, now ensure they are treated as the same
386
386
// So that we can compare the objects easily
@@ -467,18 +467,18 @@ fn compare_environments(env: PythonEnvironment, environment: PythonEnvironment,
467
467
}
468
468
env. prefix = environment. clone ( ) . prefix ;
469
469
470
- // assert_eq!(
471
- // env, environment,
472
- // "Environment mismatch when using {} for {:?}",
473
- // method, environment
474
- // );
470
+ assert_eq ! (
471
+ env, environment,
472
+ "Environment mismatch when using {} for {:?}" ,
473
+ method, environment
474
+ ) ;
475
475
476
- if env != environment {
477
- error ! (
478
- "Environment mismatch when using {} for {:?} and {:?}" ,
479
- method, environment, env
480
- ) ;
481
- }
476
+ // if env != environment {
477
+ // error!(
478
+ // "Environment mismatch when using {} for {:?} and {:?}",
479
+ // method, environment, env
480
+ // );
481
+ // }
482
482
}
483
483
484
484
fn verify_we_can_get_same_env_info_using_resolve_with_exe (
0 commit comments