Skip to content

Commit 6e2d069

Browse files
smurfixsmurfix
committed
Tests: remove superfluous lambda
1 parent fc1ea8f commit 6e2d069

File tree

1 file changed

+43
-43
lines changed

1 file changed

+43
-43
lines changed

‎tests.py‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def hello():
245245

246246
assert 'hello' in manager._commands
247247

248-
code = run('manage.py hello', lambda: manager.run())
248+
code = run('manage.py hello', manager.run)
249249
out, err = capsys.readouterr()
250250
assert 'hello' in out
251251

@@ -259,7 +259,7 @@ def hello(name):
259259

260260
assert 'hello' in manager._commands
261261

262-
code = run('manage.py hello joe', lambda: manager.run())
262+
code = run('manage.py hello joe', manager.run)
263263
out, err = capsys.readouterr()
264264
assert 'hello joe' in out
265265

@@ -274,19 +274,19 @@ def hello(name='fred'):
274274

275275
assert 'hello' in manager._commands
276276

277-
code = run('manage.py hello --name=joe', lambda: manager.run())
277+
code = run('manage.py hello --name=joe', manager.run)
278278
out, err = capsys.readouterr()
279279
assert 'hello joe' in out
280280

281-
code = run('manage.py hello -n joe', lambda: manager.run())
281+
code = run('manage.py hello -n joe', manager.run)
282282
out, err = capsys.readouterr()
283283
assert 'hello joe' in out
284284

285-
code = run('manage.py hello -h', lambda: manager.run())
285+
code = run('manage.py hello -h', manager.run)
286286
out, err = capsys.readouterr()
287287
assert 'Prints your name' in out
288288

289-
code = run('manage.py hello --help', lambda: manager.run())
289+
code = run('manage.py hello --help', manager.run)
290290
out, err = capsys.readouterr()
291291
assert 'Prints your name' in out
292292

@@ -301,19 +301,19 @@ def verify(verified=False):
301301

302302
assert 'verify' in manager._commands
303303

304-
code = run('manage.py verify --verified', lambda: manager.run())
304+
code = run('manage.py verify --verified', manager.run)
305305
out, err = capsys.readouterr()
306306
assert 'YES' in out
307307

308-
code = run('manage.py verify -v', lambda: manager.run())
308+
code = run('manage.py verify -v', manager.run)
309309
out, err = capsys.readouterr()
310310
assert 'YES' in out
311311

312-
code = run('manage.py verify', lambda: manager.run())
312+
code = run('manage.py verify', manager.run)
313313
out, err = capsys.readouterr()
314314
assert 'NO' in out
315315

316-
code = run('manage.py verify -h', lambda: manager.run())
316+
code = run('manage.py verify -h', manager.run)
317317
out, err = capsys.readouterr()
318318
assert 'Checks if verified' in out
319319

@@ -332,11 +332,11 @@ def hello(name, url=None):
332332

333333
assert 'hello' in manager._commands
334334

335-
code = run('manage.py hello joe', lambda: manager.run())
335+
code = run('manage.py hello joe', manager.run)
336336
out, err = capsys.readouterr()
337337
assert 'hello joe' in out
338338

339-
code = run('manage.py hello joe --url=reddit.com', lambda: manager.run())
339+
code = run('manage.py hello joe --url=reddit.com', manager.run)
340340
out, err = capsys.readouterr()
341341
assert 'hello joe from reddit.com' in out
342342

@@ -350,11 +350,11 @@ def hello(name):
350350

351351
assert 'hello' in manager._commands
352352

353-
code = run('manage.py hello --name=joe', lambda: manager.run())
353+
code = run('manage.py hello --name=joe', manager.run)
354354
out, err = capsys.readouterr()
355355
assert 'hello joe' in out
356356

357-
code = run('manage.py hello -h', lambda: manager.run())
357+
code = run('manage.py hello -h', manager.run)
358358
out, err = capsys.readouterr()
359359
assert 'Your name' in out
360360

@@ -368,11 +368,11 @@ def hello_again(name, url=None):
368368

369369
assert 'hello_again' in manager._commands
370370

371-
code = run('manage.py hello_again --name=joe', lambda: manager.run())
371+
code = run('manage.py hello_again --name=joe', manager.run)
372372
out, err = capsys.readouterr()
373373
assert 'hello joe' in out
374374

375-
code = run('manage.py hello_again --name=joe --url=reddit.com', lambda: manager.run())
375+
code = run('manage.py hello_again --name=joe --url=reddit.com', manager.run)
376376
out, err = capsys.readouterr()
377377
assert 'hello joe from reddit.com' in out
378378

@@ -384,12 +384,12 @@ def test_global_option_provided_before_and_after_command(self, capsys):
384384

385385
assert isinstance(manager._commands['simple'], SimpleCommand)
386386

387-
code = run('manage.py -c Development simple', lambda: manager.run())
387+
code = run('manage.py -c Development simple', manager.run)
388388
out, err = capsys.readouterr()
389389
assert code == 0
390390
assert 'OK' in out
391391

392-
code = run('manage.py simple -c Development', lambda: manager.run())
392+
code = run('manage.py simple -c Development', manager.run)
393393
out, err = capsys.readouterr()
394394
assert code == 0
395395
assert 'OK' in out
@@ -406,7 +406,7 @@ def create_app(config_name='Empty'):
406406

407407
assert isinstance(manager._commands['simple'], SimpleCommand)
408408

409-
code = run('manage.py simple', lambda: manager.run())
409+
code = run('manage.py simple', manager.run)
410410
out, err = capsys.readouterr()
411411
assert code == 0
412412
assert 'Empty' not in out # config_name is overwritten by default option value
@@ -434,14 +434,14 @@ def test_run_existing_command(self, capsys):
434434

435435
manager = Manager(self.app)
436436
manager.add_command('simple', SimpleCommand())
437-
code = run('manage.py simple', lambda: manager.run())
437+
code = run('manage.py simple', manager.run)
438438
out, err = capsys.readouterr()
439439
assert 'OK' in out
440440

441441
def test_run_non_existant_command(self, capsys):
442442

443443
manager = Manager(self.app)
444-
run('manage.py simple', lambda: manager.run())
444+
run('manage.py simple', manager.run)
445445
out, err = capsys.readouterr()
446446
assert 'invalid choice' in err
447447

@@ -450,7 +450,7 @@ def test_run_existing(self, capsys):
450450
manager = Manager(self.app)
451451
manager.add_command('simple', SimpleCommand())
452452

453-
code = run('manage.py simple', lambda: manager.run())
453+
code = run('manage.py simple', manager.run)
454454
out, err = capsys.readouterr()
455455
assert 0 == code
456456
assert 'OK' in out
@@ -468,7 +468,7 @@ def test_run_not_existing(self, capsys):
468468

469469
manager = Manager(self.app)
470470

471-
code = run('manage.py simple', lambda: manager.run())
471+
code = run('manage.py simple', manager.run)
472472
out, err = capsys.readouterr()
473473
assert code == 2
474474
assert 'OK' not in out
@@ -478,7 +478,7 @@ def test_run_no_name(self, capsys):
478478
manager = Manager(self.app)
479479
manager.add_command('simple', SimpleCommand())
480480

481-
code = run('manage.py', lambda: manager.run())
481+
code = run('manage.py', manager.run)
482482
out, err = capsys.readouterr()
483483
assert code == 2
484484
assert 'simple command' in out
@@ -488,7 +488,7 @@ def test_run_good_options(self, capsys):
488488
manager = Manager(self.app)
489489
manager.add_command('simple', CommandWithOptions())
490490

491-
code = run('manage.py simple --name=Joe', lambda: manager.run())
491+
code = run('manage.py simple --name=Joe', manager.run)
492492
out, err = capsys.readouterr()
493493
assert code == 0
494494
assert 'Joe' in out
@@ -498,7 +498,7 @@ def test_run_dynamic_options(self, capsys):
498498
manager = Manager(self.app)
499499
manager.add_command('simple', CommandWithDynamicOptions('Fred'))
500500

501-
code = run('manage.py simple', lambda: manager.run())
501+
code = run('manage.py simple', manager.run)
502502
out, err = capsys.readouterr()
503503
assert code == 0
504504
assert 'Fred' in out
@@ -507,7 +507,7 @@ def test_run_catch_all(self, capsys):
507507
manager = Manager(self.app)
508508
manager.add_command('catch', CommandWithCatchAll())
509509

510-
code = run('manage.py catch pos1 --foo pos2 --bar', lambda: manager.run())
510+
code = run('manage.py catch pos1 --foo pos2 --bar', manager.run)
511511
out, err = capsys.readouterr()
512512
assert code == 0
513513
assert "['pos1', 'pos2', '--bar']" in out
@@ -516,7 +516,7 @@ def test_run_bad_options(self, capsys):
516516
manager = Manager(self.app)
517517
manager.add_command('simple', CommandWithOptions())
518518

519-
code = run('manage.py simple --foo=bar', lambda: manager.run())
519+
code = run('manage.py simple --foo=bar', manager.run)
520520
assert code == 2
521521

522522
def test_init_with_flask_instance(self):
@@ -536,7 +536,7 @@ def error():
536536
raise IndexError()
537537

538538
with raises(IndexError):
539-
run('manage.py error', lambda: manager.run())
539+
run('manage.py error', manager.run)
540540

541541
def test_run_with_default_command(self, capsys):
542542
manager = Manager(self.app)
@@ -561,7 +561,7 @@ def hello_john(msg):
561561
return 'john'
562562

563563
with hello_john:
564-
code = run('manage.py hello', lambda: manager.run())
564+
code = run('manage.py hello', manager.run)
565565
out, err = capsys.readouterr()
566566
assert 'hello: john' in out
567567

@@ -579,7 +579,7 @@ def hello(msg):
579579
return '\n' # just hit enter
580580

581581
with hello:
582-
code = run('manage.py hello', lambda: manager.run())
582+
code = run('manage.py hello', manager.run)
583583
out, err = capsys.readouterr()
584584
assert 'hello [romeo]: romeo' in out
585585

@@ -589,7 +589,7 @@ def hello_juliette(msg):
589589
return 'juliette'
590590

591591
with hello_juliette:
592-
code = run('manage.py hello', lambda: manager.run())
592+
code = run('manage.py hello', manager.run)
593593
out, err = capsys.readouterr()
594594
assert 'hello [romeo]: juliette' in out
595595

@@ -619,17 +619,17 @@ def correct_n(msg):
619619
return 'n'
620620

621621
with correct_default:
622-
code = run('manage.py hello', lambda: manager.run())
622+
code = run('manage.py hello', manager.run)
623623
out, err = capsys.readouterr()
624624
assert 'correct [y]: yes' in out
625625

626626
with correct_y:
627-
code = run('manage.py hello', lambda: manager.run())
627+
code = run('manage.py hello', manager.run)
628628
out, err = capsys.readouterr()
629629
assert 'correct [y]: yes' in out
630630

631631
with correct_n:
632-
code = run('manage.py hello', lambda: manager.run())
632+
code = run('manage.py hello', manager.run)
633633
out, err = capsys.readouterr()
634634
assert 'correct [y]: no' in out
635635

@@ -662,7 +662,7 @@ def test_run_submanager_command(self, capsys):
662662
manager = Manager(self.app)
663663
manager.add_command('sub_manager', sub_manager)
664664

665-
code = run('manage.py sub_manager simple', lambda: manager.run())
665+
code = run('manage.py sub_manager simple', manager.run)
666666
out, err = capsys.readouterr()
667667
assert code == 0
668668
assert 'OK' in out
@@ -676,12 +676,12 @@ def test_submanager_has_options(self, capsys):
676676
manager.add_command('sub_manager', sub_manager)
677677
manager.add_option('-c', '--config', dest='config', required=False)
678678

679-
code = run('manage.py sub_manager simple', lambda: manager.run())
679+
code = run('manage.py sub_manager simple', manager.run)
680680
out, err = capsys.readouterr()
681681
assert code == 0
682682
assert 'OK' in out
683683

684-
code = run('manage.py -c Development sub_manager simple', lambda: manager.run())
684+
code = run('manage.py -c Development sub_manager simple', manager.run)
685685
out, err = capsys.readouterr()
686686
assert code == 0
687687
assert 'OK' in out
@@ -693,7 +693,7 @@ def test_manager_usage_with_submanager(self, capsys):
693693
manager = Manager(self.app)
694694
manager.add_command('sub_manager', sub_manager)
695695

696-
code = run('manage.py -h', lambda: manager.run())
696+
code = run('manage.py -h', manager.run)
697697
out, err = capsys.readouterr()
698698
assert code == 0
699699
assert 'Example sub-manager' in out
@@ -708,30 +708,30 @@ def test_submanager_usage_and_help_and_description(self, capsys):
708708
manager = Manager(self.app)
709709
manager.add_command('sub_manager', sub_manager)
710710

711-
code = run('manage.py -h', lambda: manager.run())
711+
code = run('manage.py -h', manager.run)
712712
out, err = capsys.readouterr()
713713
assert code == 0
714714
assert 'sub_manager [--foo]' not in out
715715
assert 'shorter desc for submanager' in out
716716
assert 'longer desc for submanager' not in out
717717

718-
code = run('manage.py sub_manager', lambda: manager.run())
718+
code = run('manage.py sub_manager', manager.run)
719719
out, err = capsys.readouterr()
720720
assert code == 2
721721
assert 'sub_manager [--foo]' in out
722722
assert 'shorter desc for submanager' not in out
723723
assert 'longer desc for submanager' in out
724724
assert 'simple command' in out
725725

726-
code = run('manage.py sub_manager -h', lambda: manager.run())
726+
code = run('manage.py sub_manager -h', manager.run)
727727
out, err = capsys.readouterr()
728728
assert code == 0
729729
assert 'sub_manager [--foo]' in out
730730
assert 'shorter desc for submanager' not in out
731731
assert 'longer desc for submanager' in out
732732
assert 'simple command' in out
733733

734-
code = run('manage.py sub_manager simple -h', lambda: manager.run())
734+
code = run('manage.py sub_manager simple -h', manager.run)
735735
out, err = capsys.readouterr()
736736
assert code == 0
737737
assert 'sub_manager [--foo] simple [-h]' in out

0 commit comments

Comments
 (0)